I am now looking at Ubiquiti Unifi Security Gateway (USG) in my search for a Router/Firewall for my home network. Yes I know it a professional grade system. But at the same time it seems to have the features I want. Plus it lacks the WiFi, which I don’t need as I now have the mesh network. Plus it has a few more features I might not need now, but it will allow me to grow my network as I need in the future. Also it will make sure I do finally decouple my home network from the modem provided by the ISP, and if I need to replace the modem it will not affect my home network. Also reading from another person some one talked about how you can set it up to use a mobile hot spot as a fail over connection, so in the future I can set up a fail over connection. And it would put my whole network on a WiFi hot spot (which I already have) in case I needed. I think using something like TP-Link N300 Wireless Portable Nano Travel Router to connect WAN port 2 to my T-Mobile hot spot if ever needed. The good news is I can put that project off for a while I have not had any issues with my internet going down.
What started to be a weekend revamp of my network has turned into a muli month task, but in the end I think it will be worth it, as it will make my home network more robust.