I can trade the 24-70 and the 24-105 for the 24-70 II or the 17-40 for the 16-35 f/4L IS.
I live in Brazil and the lens I choose will be bought in the USA. Due to the Brazilian customs restrictions, I can only bring one of these lenses each time I go to USA (we have quota of US$ 500,00 free of charge and whatever is over US$ 500,00 pays 50% import tax up to US$ 3000,00 and you can´t bring goods over US$ 3000,00 on the simplified customs procedures for travellers). So, it´s either 16-35mm f/4L IS (US$ 1199,00) or 24-70mm f/2.8 L IS II (US$ 1999,00). Both lenses would cost me US$ 3198,00, which is US$ 198,00 over my quota.
Take a look at canonpricewatch.com. They're expecting prices to drop. The 24-70 II is expected to street for 1699 and the 16-35 f/4 IS for 1019. I don't know when you plan on going to the US, but it might be something to look into...