Well, they basic consumers would want wifi access point, which means beefy cpu and embedded linux. So while the “router” part might be gone, the “firewall” part will be still there, since it is so cheap and provides visible benefits.
And the advanced people would not buy switches as well, as they’d want some sort of dedicated firewall/IDS box.