Try and figure out what focal length will work for you. Then choos de best lens for that focal length. The 24mm TS-E is a great lens for example, if you consider 24mm wide enough. For the work you described I think you will be better off with a 17 or 14mm lens. Take a look at the 17mm TS-E. Also the Samyang 14mm gets good reviews and seems to have little distorsion. What 14mm lens do you use?

There are different lens for each focal length, some tend to distort more then others.