Help w/picking new gear

Okay,

Upgrading next week. Have totally dogged my poor 20d out since I got it in 2005, and don't know how much longer it's goin' keep ticking. Just so happens my Stupid Dell just died too, so that's going to limit my camera binge.

I shoot sports, Lots of boxing, MMA and equestrian. Starting to do more events and portraiture and a wedding looming in June. Also shoot nature (well I did until I got into boxing!) After I get my MAC and software, I figure I will have about 5 or 6 K For new equipment. Here is what I have now:

20d
ETT580EX Speedlight
Tamron 11-18
Canon 50 1/4
Canon 85 L 2.8
Canon 24-70 2.8
Canon 70-200 IS 2.8
Mono and Tri Pod
B&W Cir polar

Here is what I was thinking of getting:
40d
5d
Canon 588EX Speedlight
Canon 16-35
Canon 15 Fisheye
AlienBee 800 ringflash

Welcome feedback, because I think I am too close to the equipment forest to see clearly!

Sounds to me, like you will have what you need. You may eventually want more reach.

Sounds like a case for the 40D to me.
(Keeping your 20D as backup).

And, you might want to upgrade that 85/2.8 L to something faster

Best regards,
Andy

I'd maybe even think of getting a 1D 2n possibly for the sports shooting you do, or even a Mk 3 (if affordable)

But the 40D may be the most reasonable upgrade and well worth it at that.

The 16-35 isnt a bad choice, but maybe save another $1000 and get the 17-40, and maybe that AB ring flash.