I'm currently migrating that network configuration (mostly plug-and-play) to a prosumer stack of separate network appliances, ...

If you're looking to build your own router and firewall, these are the most important components you need to worry about.