Do you really need the ADSL modem to have QoS? If you can live with two units, keep your current one and turn off NAT, get rid of the AirPort, buy a WRT54G, flash it w/ DD-WRT (sveasoft fork w/ no the GPL trickery), and setup QoS and WDS.