Thanks for the suggestions. Great points every single one. I forgot to mention that I have the Nissin Di622 II flash and will bring that along too. Also I have the BlackRapid RS-5 strap which is excellent. I use Hoya HD protector filters on my lenses and have been happy with those so maybe a CPL from them and a chaep eBay vari-ND would do.

I have a Burton Zoom 26L backpack that all my gear fits in. Tripod attached to the outside. I will also bring either my Tamrac Rally 5 messenger bag or a Lowepro Nova 170AW for when I only need the body + 1/2 lenses for shorter walks. I will definitely carry all the gear on the plane (should be easy since I can offload some of the weight to my GF) and the only camera gear that's going to be checked in is the tripod that goes in our hard suitcase. Insurance is in order. I have an expanded home insurance that is valid abroad too in addition to my travel insurance. I will go and report a few new serial numbers of my new toys to my insurance company next week. We have a safety deposit box in our room and I trust the person who recommended the hotel (my aunt who works at the travel agency) so it should be alright to leave some of the gear there when going out.

I have two 32GB CF cards and spare batteries for the 7D and will take a MacBook Air and two portable HDDs to backup photos so that should be in order.

Thanks for the advice so far!