If you have the budget, MacBook/pro and use VMWare Fusion to run the image of your existing Windows system on it when you want to. (Sounds more complicated than it is. Backup PC, install VMWare on the Mac, restore PC inside the Mac. When you open VMWare you'll be using your old PC).
That is basically my setup for my iMac. They're pricey if you just look at specs. But I have never seen machines built that well, and in particular with an AppleCare plan, you won't get better service. Put plainly, they fly and they are tanks.
I'm in the software business. I have owned a lot of PCs.
The Toshibas we switched to last year run like watches. Excellent keyboards, good screens, and stable. Custom built satellites with i7 and 8 GB RAM. I run CS5 on it just fine.
HP has been total junk. All gone now. Keys falling off, batteries getting permanently stuck, poor repairs. About two years ago, their printers all fell apart, too. I think only the brand name keeps them going now. By the way, we did find out that they run some kind of OEM modified Windows. The Windows updates would freeze and lock the machines as a result. Nice. Thanks for wasting a ton of time and money, HP.
Sony we had as well. Keyboards just wear out. Darnedest thing. A bit pricey, but no other issues, other than all of the junk software installed, some of which it does take a true geek to uninstall. Never understood why any manufacturer did that to customers. Don't install it, just give us the disks. To this day Apple does that.
Lenovo is the old IBM ThinkPad line. My clients complained about performance, but they are built like tanks, still. Keyboard is tight but very firm, screen is good for the business user. Passed because of tight keyboards and what appear to be screens which lose brightness over time. The screens also just don't seem quite sharp enough for editing photos. I could never quite put my finger on it, but I think they just cut a few corners.
By the way, watch out for all online reviews now, including PC Mag and other names you might remeber from the old days. I suspect they are all paid cheerleaders because what they compare is what manufacturers send to them on paper. I listen to other business owners, customers and learn by making mistakes. It is just too bad there is no longer an objective source for reviews.