Which would be your choice for a travel kit?

Just for background, my old travel kit for years was:

Rebel S (film)
Flash (forget which - the little one like the 220EX)
24-85
75-300
2xTC
Filter set, batteries, mini-tripods, cleaner, 10 rolls of film, etc.

This is for general travel (attractions, beaches, submarines, restaurants, etc.).

New possibilities:

A)
5D
15mm fisheye
24-105L
70-200/2.8L IS
two 1.4x TCs
580EX

B)
5D
15mm fisheye
17-40L
Tamron 28-300VC (assume it's about the same as the Sigma 18-200OS)
580EX

I own everything listed except the 28-300VC which isn't out yet.

You should also know that my wife will be carrying the Canon S3IS.

So which would you do? Take the speed, lack of range (300-400) and optical hit to carry the lighter and more convenient 28-300 and get the benefit of a rectilinear ultrawide (17-40L), or suffer the weight and convenience hit to get the speed, range and optical quality of the 24-105/70-200 combo?

The only other lens I have that isn't listed here is the 35/1.4L. And yes, I'm thinking about that too.

--
Lee Jay
(see profile for equipment)