Network Set-up

I have been trying to get Homekit to work for the past year and have always had issues with disconnects or devices not responding. I believe I have now narrowed it down to my network causing the issue thanks to a post on another thread. I have also read on a mac forum that having 2 routers in the same network can cause issues with bonjour. They recommend bridging one router.

My current setup is as follows. I have 1 modem/router supplied by my ISP provider which has 4 ports. On one of those ports I have a 16 port network switch connected with most of my devices connect to it. The other 3 ports on the modem/router also has some devices connected. In addition I have a netgear wifi booster. I believe this would also act as a router correct? What would be the proper way to set this up. From What I read it would be to bridge the modem/router, hard wire the Netgear and configure it as my main router and then hard wire my network switch to the Netgear. My only issue would be that my Netgear and network switch are not in the same room and this would mean having to run 2 wires from my media closet to my home office to connect the Netgear as my main router. Any other way to configure this setup without running new cables.