I'm looking for a Dual-N band Router OR ADSL Gateway and I'd like some recommendations.

Situation: I have a 802.11b/g ADSL gateway provided by my telco, but the WIFI signal won't cover all the house (especially the living-room, so my tv-connected Mac Mini has poor to no internet access).

So I'm looking to either replace the DSL modem with a N-enabled one, or to add a Router to the mix. I've had a modem+router setup for many years, and I know the advantatges (double NAT, double FW = more security) and issues (more complex to troubleshoot, two possible points of failure), so I'd rather live with a single (ADSL Gateway) device, if possible.

Requirements:

• Dual-N Band (300 Mbs WIFI)
• 1 GB Ethernet ports
• ADSL2+ support (if it's a ADSL gateway, which would be desirable)
• "Best" range and speed possible
• Nice to have:
  • USB port to share disks/printers on the network
  • Media streaming

I've been a long time user of Linksys, so googling around I found the WRT610N (http://www.linksysbycisco.com/US/en/products/WRT610N) for a "Pure Router" perspective, and it's one of those that Linksys styles "N++" (http://www.linksysbycisco.com/US/en/promo/Promotion-Go-Wireless?stepname=Promotion-Step-Go-Wireless-High-Performance)

But I haven't been able to find similar "ADSL" gateways. I've found the WAG320N, but there is little to no info in the Linksys site (i.e., i don't know if it's Dual Band, or if it has GB ethernet)

Any opinions/recommendations of other products/suggestions are more than welcome.