Upload & Sell: On
If I were starting over, I'd buy a D800e and an 85 1.4 G. Optional lenses would be the 24-70G or the 70-200 VRII (not sure that would fit your budget). BTW, given current prices, Nikon seems to be less expensive than Canon.
Now if you don't print your photos, go with an Oly OM-D E-M5. This is a hot camera right now in the 4/3rds market, having 16mp. The images I've seen look great. I should add that this camera isn't going to handle low light as the Nikon or Canon cameras do.