Pass on the fisheye, unless you can find an affordable "rectilinear fisheye" (has optical correction built-into the design). Software correction just blurs the resolution unavoidably.

The 17-40 is a rather attractive looking design -- I think I'd have one by now if I didn't already own the 16-35 (at twice the price.. ouch!).

Cheers