I almost never nibble on these "buy" threads, but since Tim did, with his 11,000+ posts, I'll BITE...
If money is plentiful, buy the 24-105 f/4L IS (you're looking for an excuse anyway) AND a Kenco new DC (digital camera) 12mm extension tube. That will cover your new lens lust, your macro lust, your honeymoon lust, etc. Take that combo, or take it with the 17-40mm.
A 12mm tube, at 24mm focal length gives about 0.5-0.6x magnification for "thing in their environment" close-ups. A 12mm tube on the 17-40mm @ 17mm provides a whopping 0.8x magnification. Close to true macro. I love "a thing in its environment close-ups" which can't be done with macro lens. Of course, then you'll be doing that instead of paying due attention to spouse....
Jack