Two fixed or one zoom?

Hey guys,

I'm currently using a 100mm macro with my 5D mark ii. I was originally thinking of getting the 24mm 2.8 and and a 50mm 1.4 to kind of fill in the gaps.

Now I'm looking at either a 24-105mm L or the 24-70mm L as a good alternative, since it basically fills those same gaps but in one (probably) better built lens.

My interests are mainly in walkaround and night photography / long exposures. I do about equal measures of both. I've heard good and bad things about the two zoom lenses. The wider angles are probably of more interest to me.

I can get the 24-105 for roughly the same price as the two primes. I hear it doesn't perform so well at the wider end, however.

Suggestions?!