Mac OS has slipped a bit in the last few years, but your first mistake was the Air.
- Go with the Retina 13" Pro.
- Spend some time learning the awesome multi-touch pad.
- Jump the preferences and turn scroll bars on (don’t ask me who made that a default!).
- Screw the Dock and just use Spotlight to launch and find things (switch to Quicksilver (http://QSapp.com) when you start getting cozy).
- Learn to love the power of three modifier keys — seriously, there’s no other way.