Almost same boat here. I am on the Early-2011 High End 13", and I'm about to go to the base 13" + 8GB ram air. I have the 2012 13" mbp on order, but i've been convinced to return and get the air instead.
For me, the only computing intensive thing I do is Solidworks - and I have a dedicated windows machine for that.