As much as I wished there was an answer for you, the real only choice that I can see (without having tech retailers trying to rip you off and the like) is to build your own machine.
Prebuilt machines have always ended up bad for me whether or not it is because of some performance issues, or pre-installed junk that usually comes with these.
As for a laptop, I really don't see anything out there that would really satisfy your wants there. Maybe once the patch for (I've been out of the loop for awhile, it may have been released) dual core CPUs would make it worthwhile to get a laptop instead (provided you have a decent joystick) but if that's what you are looking for, I'd wait.