I upgraded from the D40 to the D7000. I was amazed at the difference. I think you will be amazed too.
I like the 1/3 crop in the new camera. Since, I usually have to crop anyway, that would be a plus. Still, I have no immediate plans on buying the D7100. Right now the D7000 is a solid birding/wildlife camera.