The 17-40 f/4 L is a great lens and well within your budget but very limited zoom range ... I take a lot of group photos and the 24 mm on 17-40 (even on 60D & 7D) had barrel distrotion which I did not like ...
Since the 17-40 isn't the sharpest lens on the block anyway, I don't think distortion correction in post will make that much of a difference?
- EF 17-40mm f/4L USM - Because I like the wide angle ( and I don't think the 17-35 justify the price tag)
- EF 24-105mm f/4L IS EF USM - Looks like a very good range coverage, but I lose some of the wide angle.
- EF 24-70mm f/4.0L - Looks good on the paper, but It's still not available, and I have an opportunity to purchase a lens now.
Concerning the lenses *you* asked about ... the new 24-70/4 is ridiculously overpriced, so as for 17-40 or 24-105 you simply need to determine if you need the wide focal length on crop (or ultra-wide on ff). For me, taking a step back has usually solved this problem outdoors and you can use panorama stitching to "get it all in". So do you shoot group portraits and/or indoors in tight spaces?
Concerning the lenses you didn't ask about: +1 for the Tamron 24-70 esp. on crop, after the price drop it's good value now and better build-quality than ef-s lenses. But of course esp. on crop f2.8 even with IS doesn't enable you to shoot in the dark and get good quality, so it's rather for thin depth of field if you want/like that.