Canon 16-35mm is likely to offer best range, but if you fancy wider Tokina 11-16 or 12-24 will work fairly well (you will lose 1-2mm at the wide end, but that's nothing). 17-40 is getting not so wide (17mm has bad distortion so after correction its more like 18-19mm). And 'S' probably stands for 'soft'.