I had a D7000 and now have a D600. One of the major pains of upgrading was loosing the wonderfull 16-85, it's a perfect match with the D7000. Take into account that the cost of upgrading to the full frame will have the added cost of getting a new general use zoom, or at least a normal and a wide prime. So, you're talking about three times the expense, while the bodies only differ by a factor of two.
Both are very capable cameras, and coming from the D80, you'll be amazed by either one. But are you up to the expense of going full-frame, knowing that involves loosing range and getting new wide and normal lenses?
Considering you have the 70-200, you might sell the other two lenses, but that will only bring not so much money. On the other hand, you can find a temporary fix getting some AF-D lenses (zooms or primes) while you save up for better glass.
The D7000 can be found at very inviting prices nowadays, new or used.
http://egozarolho.blogspot.com 1. Good content, good aesthetics and good tecnique. On that order. 2. Light is more important than glass and pixels. 3. In the digital photography process, software is as important as gear.