Sticking with a MacBook Pro 13" as well. Gives you a hard limit on the length of functions that fit on a screen. Upgraded to 16G RAM, 1TB SSD + 2TB HDD (not really possible with Retina), since I work a lot with data. Would love to upgrade to 2 x 2TB SSDs some time.
That's my plan as well. Glad there are more fans of the non retina 13" ;)