Maybe "whitebox" stuff will have a moment here. Buy a ARM based "computer" that just happens to have a built in switch and 802.11 radio, and separately purchase an SD card with the OS on it.
Or, perhaps this will be VyOS's time to shine... https://vyos.io/
Can't really see anything really happening in the consumer space, but maybe business/enterprise will move in one direction or another.