Canon EF 24mm F/2.8 IS or EF 17-40 F4L USM For Architecture

I shoot mainly architecture night photography and street photography and wanted to know which would be better for this between these two lenses the 17-40 is about $200 more from canon refurbished store any input I'm on a canon 6d.

I would pick the 17-40L. With architecture 24 is not wide enough in lots of situations in my opinion.
I do a lot of architecture and I am a full time real estate photographer and the 17-40L is all I need for that.

I wish my boss could buy me a 16-35/4.0L IS for me, but that ain't going to happen haha.

Edit woops, didn't read the street and night photography part, for those things the 24 works better.

are you averse to manual focus, and/or a tripod? The 17-tse and 24-tse are the gold standard for architecture

I don't mind using manual focus while on a tripod

Get Samyang 24mm TS, alot cheaper than Canon equivalent and then possibly 14mm or 35mm aswell. Although Canon TS is sharper but thats why its pricey.

Man, there's a world of difference between a 24mm and a 16-17mm!
Yesterday we went on phototrip, one guy had a 24-105 with him (first time for him to do some architecture). Inside the buildings with high walls/stairs he had to backup a lot and still couldn't get in on picture. We where just standing in the middle of the rooms with our 16mm's and everything framed.

On a 6D I advise 3 lenses for architecture (I had them all, in order of my preference) :
Canon 16-35 f4L IS (best, corner-corner sharpness allready from f4 wide open! most expensive, on Eglobalcentral cheapest)
Tokina 17 f4 (prime only on Ebay 4 sale and best price)
Tokina 16-28 2.8 (corner-corner sharpness but no filters, sometimes flare but you can avoid it out of experience)
Canon 17-40L (best price/quality Canon if you don't mind that it's not so sharp in the corners, you have to stop down much)

I don't speak of the Canon 16-35 f2.8's, as they are too unsharp in the corners for the high price, I had both and disliked both.

Anyone have images to share between the two lenses using a 6d?