If the D80 is roughly the same price and has a built in motor that would be my choice. It'll save you money in the mid term as you'll be able to make full use of the old AI lenses which can often be quite cheap.
I've just leaped from a D40x to a D7000, and it really was a leap, but the D40x is...