I'd also strongly suggest to have router and access points as separate physical devices.
A great step up for someone with an AIO consumer router/WiFi AP would be to get something like that as a router, flash OpenWRT on the old router and transform it into a "dumb" access point.