Back when i was on ADSL i used a Draytek Vigor 120. This is a dumb modem that translates PPPoE (set in your router) into PPPoA for your ISP.
There's a newer model, the DrayTek Vigor 130, that does ADSL, ADSL2+ and VDSL2 (FTTC).
For small, x86 machines, these look pretty nice. 4 Intel NICs, a J1900 Celeron (3x the speed of the CPU in Panda's Smoothwall machine), starting at ~£130. Just add RAM and storage and install pfSense or some other firewall OS.
For the wireless either the Ubiquiti Unifi APs already mentioned, or routers flashed with OpenWrt.
My network is currently powered by OpenWrt. Next month i'll be ordering one of those J1900 boxes and installing pfSense on it. Then my OpenWrt routers will be reconfigured to serve purely as access points (4 networks, each on their own VLAN). Further down the line i'll probably replace them with Ubiquiti Unifi APs.