Yup, choices are painful.
But for $700, if you are using the lens on a tripod most of the time, the 17-40 is a decent lens. OK, corners suck at f4, but really who needs corners at f4? Well, I guess some do. 77mm filters, cheap, weather-sealed and decently sharp at f8 and smaller (and actually OK in the center at f4-5.6). If you thought the 10-22 was OK, I don't see you having a problem with the 17-40. It's also fairly light and not too big, so great if it's not a FL you're going to use all the time.
But I do landscape as my primary 'most-fun' shooting, so I recently got a TS-E 17mm so maybe I can affort to be upbeat about the 17-40. The TS-E is also sharp enough for me with a 1.4TC. Actually i think the biggest benefit is the shift, but lets just say I have to change my PP and printing sharpening for this lens.