Is your main consideration PS work, or is gaming, etc., also of concern? Had just run across an article(can't remember, sorry) where the author ran PS tests comparing the latest i7 iMac against an 8 core MacPro, with the iMac outperforming the MP.
As PS is CPU intensive, the take away was:
While maxing RAM is always advisable, the CPU is the primary consideration and multiple core utilization by adobe products is bound to improve.
HDD speed also has a major impact.
The video card has little impact. A decent 512MB card will be more than adequate, unless you're also doing video and game heavy lifting.
Apple has refreshed both the iMac and Macbook lines with the latest CPU technology, and the MP is probably not far behind. The latest version was released in July of last year, so seems about due. Lots of scuttlebutt flying about.