Bought a Compaq X1010 laptop about 3 months ago. It is a closeout model and precursor to a newer machine with not significantly better features that costs a lot more. It was on sale at CompUSA for $1,500 (after rebates), which included a DVD/CDRW drive and extra RAM. Nice machine--almost miraculous technology, really. If you've been plugging away on an old obsolete desktop, you'll think you've died and gone to heaven.
Spent another $150 at Compaq to get a docking station so that all I have to do is pick up the laptop and go. No fiddling with connecting and unconnecting cables. Unless you're a heavy gamer, this machine would handle all your needs and solve your other problems as well. I haven't used my desktop since I got it, and don't think I ever will. Go splurge. And good luck.
I'm pretty much set on an IBM Thinkpad T40, although I was also considering the G40 since it has internal FDD and an more ergonomic keyboard.