Best modem/router/settings for online play

[pax_bisonica]

Hi everybody! (hi dr nick...)
Looking for advice on the best option for upgrading my network setup, with a focus on (duh duh DUHHH) gaming.  With the recently announced release dates for SSF2THD and SFIV, its time for me to sort out my aging gear.  At the moment I am using a stock d-link modem (courtesy of vodafone) and a belkin wifi router.
What I'm looking for is a good 'all in one' solution - modem/wifi/router that will give me open nat for XBox Live and Playstation Network and preferably be affordable to someone on a part time income
Also, if there is a good website detailing the optimum setup of console/modem then plz let me know.  I am not a complete luddite when it comes to networking, but I am far from a genius
Thanks

[Gino]

This