Hi everyone, I need your help on determining which equipment to buy for wedding photography. I have been shooting mostly portraits and a few corporate events until now, but I'd like to move into wedding photography and similar social events. I'll be shooting my first in July. I am very happy with the Sigma 17-50mm, 30mm f/1.4 and Canon 100mm f/2, along with a pair of 40Ds thus far. But since I've started getting paid for these jobs, I have decided to buy better quality equipment. This means getting a full frame camera and lenses. I really enjoy the 40Ds and will shed a tear when I sell them.
One thing to note is that weight is not much of an issue for me. I also shoot with the outer focus points very often, so I prefer a camera with a good autofocus system. I find that my standard zoom lens is indispensable at events, although it probably helps that I have a lot of lighting already to augment it. So I've identified that a 24-70 and stabilized 70-200 f/2.8 would be my default lenses, which are the standards for many wedding photographers as I understand it. For primes, I am considering a 24mm f/1.4, one of the 50mm primes, and a prime for portraits between 85mm-135mm.
The question often gets raised if 24mm is wide enough for a wedding, but I would really not prefer to go wider for shots with people in them to avoid distortion from field curvature. Another question that gets raised is whether a macro is warranted if it's only used in a few shots. I'm thinking that a stabilized macro (100mm/105mm) might serve as a good backup to the 70-200mm. Or perhaps I could use extension tubes, although I have little experience with macro photography.
While the cost of the equipment is not so much of a concern, it would be nice to get it at a discount and Canon has a rebate for many lenses right now. The other factor is that I am located in Canada, where Nikon lenses come with a 5 year warranty. This is a big incentive for me as Canon only provides a 1 year warranty. So, what are your thoughts on what cameras and lenses would be best suited for me?

