What lens to shoot Swiss landscapes?

Hi,

I've mostly been a urban photographer up to now, but coming to Switzerland offers a whole new range of opportunities in terms of nature, and in particular landscape, photography.

I am currently equipped in APS-C (Nikon D300s + Tokina 11-16/2.8 + Nikon 17-55/2.8 + Nikon 70-200/2.8) but am intending switching to full-frame (only keeping the 70-200), unless the long-awaited D400 finally appears and fulfills its promises...

Budget-wise, aside from the D800 I intend to get, I would probably have budget left for just one lens. As suggested, it would be used mostly for landscapes (mostly on tripod), as well as for architecture in villages. My technique is not stong enough to consider a tilt and shift yet, unfortunately.

So my question to DSLR photographers out there is: based on your experience of Swiss landscapes, which lens would make most sense to go along the 70-200:

• Nikon 14-24/2.8: issue of the lack of filter thread though, and small range
• Nikon 16-35/4: range a tad weird, maybe, plus less versatile for indoor/night shooting
• Nikon Tokina 16-28/2.8: same filter issue, and range a bit small
• 24-70/2.8: getting a bit old (no VR), and wide end may be a bit too long for landscapes

I'm leaning towards the 16-35 but would love to hear comments on experience.

Cheers