I am just about to buy a 400D and thought I would buy the Canon 17-85 as a walk-around lense. I like shooting architecture/street scenes, however after reading about the barrel distortion in the 17-85 would like other opinions on a more suitable lense. At the moment have a Pro1 and there is some distortion with its 28-135 lense which I can correct with Photoshop.

