I added some more unifi APs, a Raspberry Pi4 for a low power unifi controller, and I replaced the MOCA bridges with multiple Cat6 runs letting me power most of the wifi from the generator in the basement across the house.

I should probably do a full write up of what it all is and why, and I plan to get optimum and Verizon working together so I can leverage both internet connections in the whole house.