Become a MacRumors Supporter for $50/year with no ads, ability to filter front page stories, and private forums.
WWDC is next week.

I say wait next week, to see if apple updates the MBP
 
Personally, I'd wait, but if you need a machine now, the ones that you mentioned are going to be great, very powerful computers. I have the 17" early 2011 variant and it can pretty much handle anything I throw at it.
 
Register on MacRumors! This sidebar will go away, and you'll see fewer ads.