Upload & Sell: Off
Haven't kept up with Canon lenses but I'd have to say for #7 I think Canon has the edge simply due to their superior tilt-shift options.
6. Wildlife I'd also have to give the edge to Canon since they make a 800mm lens, and a seemingly wider array of "budget" telephotos available as well (400mm f5.6, 400mm DO, etc). I know Nikon has some "long guns" in the catalog, like an 800mm, 1200mm, and 1200-1700mm zoom, but are they still made?
I'm excited by the D800E and its prospects for landscape shooting but I wish Nikon would update their PC-E lens offerings. Namely include a >24mm variation, and update the movement mechanism to allow rotation of the tilt/shift axes.