Can't believe you're losing sleep over this one. Get the 24-105L and be done with it. If you ever find a need for 17mm the decision is already made. I use the 17-40, 24-105 and 100-400 on a 5D, and the 24-105 gets used about 90% of the time.
Thanks for all the tips guys. It seems as if you've sold me on the 24-105. 18mm is not wide enough on the crop body and I understand it's like a 28 on a FF. I was just wondering if i should get something super wide. I don't want to not have wide enough. I like to go super wide sometimes, but I've played with both a bunch of times, and I'm guessing the 24-105 might be good enough then. The prices for the kit and 5D with 17-40 are about the same. BH has the kit for $2,899.95 and then alone the 5D is $2,199.95 and 17-40 for $679.00, so the 17-40 combo is a little more. I think I'll go with the 24-105 then. Now the dilemma is actually being able to get it.