Thanks for all the replies! I have no doubt that if I was choosing between 17-40 and 17-55 for the first time that I'd go for the latter. However, given that I already have the 17-40 and that the 17-55 is an EF-S glass, I think I'll simply *suffer* the former and save up my money for the 5DIII.

Still getting the 70-200 L IS II though.

Thanks again!