Hmm, while I'd agree a crop camera is better in many ways there is no way I would give up my 6D before I gave up my 7D when it comes to astrophotography. There is barely any comparing the two in terms of noise and high end ISO colour performance. It's cheaper to buy the 6D and get 2-3 stops improved capability than to buy f/2.8 or faster L quality glass. Also, I wonder how much you'd really be missing out on if you took a 20.2MP from the 6D and cropped it - compared to the 7D's 18MP (if you're concerned about full frame distortion you can just crop it like it would be on a crop body - more or less). If I could, I would take the high ISO performance and put it in a 7D, but that's just not possible.
My impression of the 16-35 is that it doesn't receive many rave reviews. Typically reviews comment of the distorted corners. I have the 17-40 (bought it over 10 years ago) and while it has some edge distortion on full frame it is well controlled compared to the alternatives.
My Tamron 24-70 f/2.8 has different distortions to the 17-40, perhaps slightly more but they are different so hard to compare. All-round I enjoy it for it's affordability. I'd only buy it if getting a full frame.
The Nikon 12-24 f/2.8 is the class leader, but you won't have auto controls.
If choosing one lens I wouldn't go a prime like the 14mm.
My 2c worth. Not easy decisions