Currently own D50, Upgrade Advise

Hi,

I currently own D50, 50mm, 18-200 Nikkor Lenses, SB600 and SB800. Obviously its time to upgrade the body. D50 is a great camera, but what I miss the most is 'commander' option. i.e. it cannot fire my SBs in slave mode. I have to mount SB800 to fire SB600. Yes, I can get SU 800 and that will fix my problem. But I am greedy, I want more. I have Lightroom 3, so I want to Teether, and I want other bells and whistles, and yay. Basically, I want a new toy. Happy? My purpose is to photograph family, and stuff here and there. Not even close to professional.

I am waiting for D95. And I can wait - this D50 still takes awesome pictures. My question is, should I jump to D7000 or wait for D90 replacement?

Thanks.