I wouldn't dismiss the 17-40mm L or the 16-35mm L (which I use). My colleagues and I have done excellent interiors with those lenses.
That being said, if your architectural photography income can pay off a TS lens, that would be the ideal choice.
I would absolutely dismiss the 17-40mm for Architecture, I would find it hard to think of a worse lens, the distortion is all over the place. Colour, resistance to flare and contrast are excellent. Getting anything straight with it would be a long drawn out nightmare. For landscape, weddings or street photography a fine lens, architecture on a tripod you are starting at a huge needless disadvantage. Most photographers I know (other than me) bought it and quickly got rid, because of it's distortion and very poor edge performance. I like it's ability to shoot wide into the sun and hold contrast and colour that is why I use it.
Kevin.