BD - the best bet is to get a combined ADSL modem and wifi router - Linksys seems to get good reviews. Others rave about Belkin and Netgear but I have had warranty replacements from both of these cos.
You can then remove the boxes you have already. A wifi router will normally have 4 ethernet ports so you can plug in PCs/laptops that don't have wifi.