Router or switch for replacing ISP one

It is fairly common for new apartments to have a small box/panel at the entrance where the fiber comes in and ethernet leaves for every room. In the one I am renting at least, there is only one power socket.

The ideal device would then have 1 sfp+ cage for the gpon and 3 or 4 10g ports, no fans.

I am using a CRS309-1G-8S+IN that I had available, but it barely fits, 10g rj45 sfp+ are either hot or expensive and a faster cpu wouldn't hurt.

If starting from scratch I would probably go with the CRS304-4XG-IN plus a media converter for the gpon.

The thing that would be really awesome would be an upgrade of the RB5009UG+S+IN with some of the rj45 ports upgraded to 10gb.

As this is a user forum...do you have a question? Or is this a product request?