I'm looking to upgrade my Nikon D40 to a better quality Nikon DSLR body?

Which (in your opinion) is the best choice for me as far as Nikon's DSLRs for less that $800 (body only)? I'm going to be a senior in high school next year and will be studying photojournalism in college. I love my D40, but I'm looking for an upgrade that has more mega pixels and features. Any tips or suggestions will be greatly appreciated.

The Nikon D90
http://www.amazon.com/...001ET5U92/

exactly $800 off of amazon.

Nikon D7000 - the replacement for the D90.

The D90 or D5100 should be good enough but you see your D40 can do more than just a photo journalism application.

Upgrading your kit lens should be your better option instead of upgrading your D40.