

Assuming you want to replace it all, not just home lab use…
- Drop their router/modem combo if you can, get your own modem and router. Options are pretty wide here, but what I prefer is a wired router and separate WAPs. I’d lean toward opnsense for the router OS, and I’d use something with as little as two to four ports - one for the modem, one to hit a switch, two more gives you a second modem option (cellular as mentioned) and a second switch to hit if needed. Ideally with 10gbps for future proofing. Dont make your router/FW do lift of a switch, IMO.
- Get a switch sized to your network. Since you’re going with a 10" rack, a small 8 port with a couple 10gbit uplinks would fit the bill. Managed only here. You dont need the latest and greatest - I have a stack of Aruba 2920s, 48+4 PoE+ (stacking cables) that I got for free that were being replaced. They came out in 2013 and went end of sale in 2017, and have been in my home lab since. So - any thing managed that handles what you have and a bit more.
- In terms of WAP, TP-Link, ASUS, and Zyxel all have decent hardware that works well.
Hopefully more people learn that this is the important part.
It becomes nonsense when you just feed it everything and the kitchen sink. A well trained model works.