About a year ago I purchased a Nikon D40 with the kit 18-55mm lens. And I loved it. I then purchased a Nikon 55-200mm lens and explored zooming. About six months ago I purchased a 28-75mm f/2.8 Tamron lens. The quality of my pictures increased again. Now, I am not loving my D40 as much. It has bad noise control, so-so autofocus, doesn't take video, and no decent intervalometers are compatible with it. I was wondering if I should upgrade to a Nikon D90 or maybe even a D300s. I know that an upgrade for the D90 may be coming in the next few months. So what should I do?