Upgrading help d7000 or d90?

I currently have a Nikon d60 and its been a few years now so i thinking of upgrading to something a little more highend. i am looking for opinions. Should I upgrade to the new d7000 which cost about 1000 dollars or to the d90 which is much cheaper since the price drop because of the d7000.

There is also the third choice and waiting for another camera causing other cameras to drop in price and such. However, I am not sure what schdule Nikon has towards camera releases.

is cost worth the quality? Any help is much appericiated.