Looking for 10D replacement, 30D or 5D?

I'm the happy owner of a EOS 10D that has seen over 55000 shots without a single problem. Now I'm starting to get a bit concern because of the Shutter Life expectancy on this camera (and from what I read I already think that mine is pushing it.)

The thing is that I'm planing a trip to Europe and I'm afraid that the shutter might fail during that time. So given the age of the camera I thought that it might be time to get a replacement.

This is why I would like to request your recommendations, should I get a 30D or should I go for the 5D? My interests are mainly wildlife photography, landscapes and macros. and I own a Sigma 50-500 (the original), a 15-30, a 50mm & 105mm macros.

I know that a 40D might be coming out soon, but I doubt it will be in time for my trip, so I guess the choice is between the 30D or 5D.

I'm leaning towards the 5D but I want to make sure I'm not making a mistake.
Does anyone know if I'll be able to use the same 10D batteries on a 5D?
will all my lenses be compatible?
Will I still be able to use any the 550EX flash?
Will I notice the difference between the 10D and the new model??

Any experiences, pros and cos will be welcomed.

Thanks in Advance!

A.