DIY desktop PC or MBA?
Interesting comparison. How's this for an idea?
Build the desktop since it will clearly suit your "heavy" computing needs for a long time to come, and then consider using a smart phone instead of a laptop. An eye-fi card should let you capture images to the right phone and upload them to "the cloud", as well as serve many other internet tasks.