Well the MacBook Pro just got a nice update, and the iMac/Mac Mini lineups are rumoured for an update in September/October. Might be worth waiting for the new rollout if you can? Outside that, my money is still on the iMac if you don't need portability. Bigger screen and discreet graphics for less money.