Become a MacRumors Supporter for $50/year with no ads, ability to filter front page stories, and private forums.
Go for iMac

I don't very well know whether Macbook Pro will be out of production or upgraded. But I would suggest you to buy the new iMac or Mac Air book, as they are the latest ones and very attractive according to me rather than buying Macbook Pro.
 
Register on MacRumors! This sidebar will go away, and you'll see fewer ads.