D700 upgrade/update to Dxxx or D7000?

I'm debating between upgrading/updating my D700 to either its replacement Dxxx when it comes out later this year, probably during Fall/Winter 2011 (according to what I've read), or, alternatively, just getting the D7000.

I'm not in a rush, so I thought that the better option would be to wait for a "two digit model number replacement to the D700".

May I ask what the good folks here think about this?

Thanks in advance!