I'm way past due for a new machine. Every time I've about made up my mind, something new (Intel Mac) pops up. One of these days soon, I'm going to pull the trigger. My wife says just get something that has lots of expansion capabilities, even if it costs more to begin with.
I need to be running InDesign, too, and be able to have all my graphics apps open at the same time. And give Folding@Home more to work with.
When you get your new one, keep your current one running foldings.