In short, I'm looking for a combined ADSL modem and wired+wireless router with QoS support. I've done some looking around, but I've not found many options, so I'm wondering if anyone here has any suggestions.

To offer a bit more background; my current network is split between two rooms with a wireless link:

In the living room: ADSL modem doing NAT -> Hub -> Airport in WDS mode
In the office: Airport -> Switch -> Two VoIP routers

Because I have VoIP routers at the end of the network, there are issues with the sound breaking up when I'm using the net elsewhere in the house.

I would like to replace the ADSL modem, hub and Airport with a single box. Because of the VoIP, I need it to support QoS and because there is no wire between the living room and the office, I need it to work as a WDS to the Airport in the office. It also needs wired ports so I can plug in the TiVo.

Anyone got any suggestions? Am I asking too much?