Recommended wireless router for Intel Pro 3945ABG?

I just received a new Dell E1505 laptop with the Intel 3945ABG wireless
card. Currently, I run a 10/100 wired home network using an old Netgear
RT-314 with 1 desktop, 1 laptop and 1 music server. While beta testing
Vista RC2 I had problems with the router and using remote desktop from
work so I am looking at switching to a more Vista friendly wire/wireless
network.

Can someone recommend a good wireless router to use in my situation? I
am going to keep using cat5 for the desktop and music server and am only
interested in wireless for the laptop. My house is a small split level
so range should not be much of a problem. The laptop will be used mostly
from within 35 feet of the router (different floors) but through an open
stairway...

Thanks,
Dave