Here is what it looks like after the changes. The new tv and xbox has app for plex so there is no need for a separate devices.
Unfortunately there is also an ugly side.
In order to connect all the rooms I had to move the switch right next to the router. It is not pretty but it works. The Netgear R7000 is just so massive that I had to tape the switch into the door because there is no room for it. I’ll see if I can find a smaller/thinner 8-16 port switch and fix the cabling.