The other option I have thought about is maybe picking up a 50 f/1.4 instead and keeping the 17-40. I'm not particularly fond of the 50mm focal length, but I could force myself to use it. Thanks for all the input so far guys.
35mm f/2? Still cheap, just see how it goes.