d700 wideangles - which one?

Hi all, it's been a while. Okay, just bought a D700 with 750 shutter count + a Nikon 105 f2 DC. I also have a 50mm AFD f1.8, D90, SB900, Metz 58 af1, and a Tamron 17-35 f2.8-4. I need a wideangle to replace the Tamron (it's quite soft on the D700), and I'm thinking - possibly the Nikon 20mm f2.8 afd - (really like the 20/21mm range. At a push I would consider the 24mm f1.4, or 16-35mm vr (the distortion characteristics of the zoom are putting me off though).

What am I into at the moment? portrait and industrial/commercial work. (Now full time pro) - frightening and great all at the same time!
Would you be happy using the 20mm?.

Cheers.
RTF.