I'd take the 24-105. You can always photostitch a panorama if you want wider, but 24 is still pretty wide on a FF and you might well want the reach of the 105 (or longer). And definitely have that polarizer; that's one filter that absolutely can not be replicated in post-processing (at least, if anyone tries to do so, they'll end up with a photorealistic painting rather than a photograph). Two batteries, if you start out with both fully charged, should be enough for 5 days of judicious shooting if you don't chimp to excess. Avoid Live View or shooting videos; they can burn up your battery life. Same with Servo AF, if you have the option.