Stephen, be aware that Nikon production has had a terrible time both in Japan after the earthquake/tsunami and in Thailand with the monsoon/floods.
As I understand it the Japanese Government has passed the unprecedented law of allowing Thai workers into Japan to help get Nikon's (and other companies) facilities working again, it could be we won't be seeing a new pro/enthusiast DSLR from Nikon for a while.
Some sources think that our dealers shelves could be looking a bit on the lean side, especially if existing stock is exhausted over the Christmas period. I'm not suggesting that you rush out and purchase in haste, I'm sure you'll eventually get the upgrade you want, but I'd take another good look at the existing D7000 if I were you, it's had tremendous praise from those that know about a good camera. You've also mentioned the D300s, as a D300 user of a few years standing, I don't think you could go far wrong, and the deals on it are very tempting at present.
Incidentally I've been waiting (along with countless others!) for the D400, but I'd be amazed - yet delighted - to see it on sale for quite a while yet, it's going to take a while for Nikon to get back to any sense of normal production.
__________________
Bill 
|