Combining the WiFi with the router never made sense to me. Routers can last a long time and WiFi gets new versions with new capabilities every few years.
I would rather just connect a separate wireless AP to my switch, preferably also with PoE. And then I can upgrade and expand that as needed while leaving the perfectly fine router alone.