Mike, I can personally vouch for option #2
I bought mine about a year ago and it renewed my interest in photography big time. The image quality (paired with a good lens) is just amazing. The 24-105 f/4 IS is my preferred walk around lens on the 5DmkII. It may be worth also considering the 35mm f/1.4L - amazing lens as well, and it's just long enough to be useful as a general purpose lens without exaggerated wide angle effects. The 17-40 f/4L is good value with excellent colours (but not as sharp as the others - probably not noticeable for time lapses).