I now like keeping modem, WAP and router /switch separate and since using self-build opnSense / pfsense box would not go back. I have used / tried a lot of one-box solutions, here is my personal summary :
Quite like : Ubiquiti, Zyxel, Draytek, Billion, Fritz!box
Meh : Asus, Netgear, most other stuff
Horrible : TP-Link