I would buy the iMac..It's a fantastic machine, and you won't be disappointed! If I'm not mistaken, you're keeping your MacBook until it quits (which could be 10 years from now), so you'd still have a machine for portability if you need it..
Yes, the 13" will be a portable machine, but I'm interested in being able to tear the MBP apart for a cheaper SSD.