Here's where I landed on this: I'm still not going to do anything for a couple of months, but at that point I am almost certain to go for a new D7000. I agree that even if Nikon were to introduce the "next" DX camera by then (increasingly unlikely as every day with no rumor or news passes) it still might not be immediately available, and if the D800/D600 introductions are any indication there might be initial quality control problems to deal with.
What cemented my decision was going back to look again at Thom Hogan's D7000 review. He has a nice chart comparing the D90 to the D7000 feature-by-feature...I had forgotten how much cool new stuff was packed into the deceptively similar D7000 body! (f anyone reading this is on the fence about the D7000, check it out!)
I'll let you know how it turns out and post some Iceland images when I return.