suggestion about canon equipment upgrade

[Tom]

Hi guys,

just joined your mailing list
I need some suggestions about some "upgrade".
I'll be in the States in 2 weeks and I'm thinking to buy something
there, for europeans it's very cheap now

I'm using a canon 350D + canon: 17-40L f/4, 70/200L f/4, 50 f/1.8 and
a couple of external flash (canon + metz)

Something I'm thinking about:

Canon 40D (or maybe 30D?)
Canon EF 16-35mm f/2.8L II USM (i would sell my 17-40)
Canon EF 24-70mm f/2.8L USM
Canon EF 70-200mm f/2.8L IS USM (i would sell mine f/4)
not sure about Canon EF-S 10-22mm f/3.5-4.5 USM

what do you suggest with a $2000 budget?
I've an idea but I'd like to know some our opinions about it.

Thanks a million!
Tom