Upload & Sell: On
Dude Mac Pro with Retina all the freaking way. Viewing photos on my 15" Pro vs my wife's 13" Air is no contest. Retina will change how you view photos.
I'm rocking a 256GB drive and (only) 8GB RAM, but it's actually my main machine. For real storage, I picked up a Western Digital USB 3.0 powered 2TB drive from Best Buy, $130. It's actually respectably fast and only uses one USB port, very nice, Lightroom performs just dandy (I also have a 27" 2010 iMac, 12GB RAM quad i7 2.9Ghz but prefer the Pro because of the solid state).
Also note, Otherworld Computing has a rather spiffy SSD upgrade specifically for the Mac Pro that's pretty awesome (but a bit pricey) - nice thing is, it includes a matching enclosure, so you can still use the SSD you pull out of the Pro, and use their larger internal SSD.
Retina all the way. Seriously. Not to say the Air's display is bad, it's a very nice ultra-travel laptop, but for about one pound more (I think?), the Pro is very, very nice.
Also, don't be afraid of refurb. Both my iMac and Pro are refurbs, zero problems, same warranty as new and you have the same option to extend AppleCare if you wish.