The iPhone is supposed to be updated around june.. So I would wait for that.
You could also get the newly updated white macbook(almost same specs as the 2.0 aluminum), AND the iPhone.
with copy and paste coming out on the iphone I bet I will be using my mba even less than I already do
I would suggest getting the iphone first and see how it goes