> I feel like router and wifi should be separate so that I can expand and upgrade the wifi independently of the router.

This _is_ the objectively better way. It's not practical for a whole host of scenarios, though.