Replying to Help Me Make a Decision.

Hello M&A, I'm looking into buying a new camera. I'm not going to fill out that whole sheet but Photography has been a hobby of mine for about 3-4 years now and I'm ready to upgrade my camera.

Current Equipment:
Nikon D60
18-55 f/3.5-5.6 or whatever the kit lens is
50mm f/1.8
AF-S 70-300 f/4.5-5.6 VR II
Nikon Speedlight SB-800
old tripod
blacks camera bag
Adobe Lightroom 3 and Photoshop CS5.

What I'm looking to do is upgrade. But as I've been shooting more and more I've truly discovered what I enjoy and do not enjoy shooting. I Really enjoy shooting sports. Anything active really challenges me, and I enjoy a good challenge. I also enjoy shooting some portraits and sort of day-to-day things i.e. cities, objects, yada yada yada. I'm mainly a 'photographer' but I would like to get into making some videos, nothing serious though.

I have enough funds to upgrade, but this is where I hit a fork in the road. Nikon or Canon. The D7000 or the 60D are my two main options. I am looking to upgrade my glass as well, so that would involve selling my stuff, which I intend to do. I want an unbiased opinion, as hard as that may be to come by. I'm going to a trip to the Galapagos in March and I really want to take some great photographs of the wildlife there. I've heard the whole Nikon for photos, Canon for videos thing before, but I want a second opinion. Nikon does make some really great glass, but for a 16 year old who is jobless half the year, It is hard to fund the more expensive lenses. Canon does make some great glass for a more reasonable price, and for what I like shooting, it works.

If I do switch to Canon, What I would like to get.

Canon 60D Body
Canon 70-200 F/4L (IS ?)
Tamron 17-50 F/2.8 non-VC (?) OR another 'go to' lens
and a 50mm Prime(not sure which is best for its price)

Nikon:

Nikon D7000 Body
Nikon 80-200 f4
Tamron 17-50 f/2.8 Or another 'go to' lens
My 50mm.
SB-800


I could probably leverage a lens for my birthday, but I'm set on buying a body fairly soon.

SO MEDIA AND ARTS, WHAT DO YOU RECOMMEND I DO?! It's a big decision for me financially and I'm not sure which path to take

SPARKNOTES:

Looking into buying a new camera (D7000 vs 60D) but not sure which path to take.


~~~~~~~~~~~~~~~~~~~~~~~~~~SIDE NOTE~~~~~~~~~~~~~~~~~~~~~~~~~~

HOW MUCH WOULD YOU RECOMMEND I SELL MY CURRENT GEAR FOR. All of it is in near perfect condition with barely any cosmetic wear. Body is fine cosmetically and internally. I'm thinking on selling it as follows
Body + Kit lens - $350
70-300 - $350
Prime - $100
Flash - $300
Package deal - $1000

Are those prices fair? I know there are no pictures to judge but everything is in a 9/10 condition, 10/10 being brand new.