I like the sound of your proposed 10-24 DX (I would ask for 8 or 9 rather than 10, but perhaps this is not possible - and I would happily have it stop at 20 in compensation).
But what your excellent pictures show is the need for good architectural wide lenses, which I fear Nikon are most unlikely to make. I would like a really wideangle perspective control lens. All the new PC lenses are FX, very understandably. And with DX they are far too long. So my dream is a PC DX lens of 16mm or less. (So perhaps I have come up with another reason for a D700...)