Replacement for D90

My D90 was stolen in Russia recently, and I am looking for a replacement. The news about the D3100 and D7000 has interrupted my search for another D90, and has me wondering. Will I be satisfied with the new D3100 instead of the D90? I mainly shoot landscapes and portraits in A mode, use a CP frequently, Raw to JPEG or JPEG only, very little PP normally. I think the D7000 is too heavy for my needs, and the weight of the D3100 is appealing. On the other hand, I loved my D90, but know that new cameras seem to offer a little more with each release. Or, should I wait for the D5100?
Thanks for your help!
Sam in NC