A couple more ideas, based on my own experience.
If you go for the pricey 85mm f/1.2 and 35mm f/1.4, but still want a 50mm for some reason, then you might want to consider the old but cheap 50mm f/2.5 macro. I have one and it is wonderfully sharp from about f/4.0 and up, while still being pretty good in the middle wide open. It is made cheaply - but not as poorly as the 50mm f/1.8 - and it has held up well for a long time in my bag. The manual focus ring is too narrow and feels pretty wobbly, but it works just fine. It also focuses down to a 1:2 mag. ratio without attachments and is quite sharp and flat-focused in close-ups. I doubt this lens will be made much longer, so, if you want a new one, you'd be better off to buy one pretty soon.
I can't pay as many compliments to Sigma as they deserve for their last generation 150 f/2.8 macro (focuses to 1:1 without adapters), the one without the IS, but with an ultrasonic focus motor. It is sharper than the newer design and just plain sharp all over the full frame format, from wide open to at least f/11.0. It feels good in hand, and the focus helicoid travel is very long - a good thing for accurate manual focusing, but it slows down autofocus to a leisurely pace. The construction is very good for a 3rd party lens - not as good as a Canon L, but it feels better than most of the non-L Canons. Yes, it's sharp wide open at 150mm, and killer sharp at f/4.0. And it costs way less than the Canon 180 or the even the newer Sigma replaceemnt with IS. This, like the Canon 50mm macro above, is probably not going to be in production much longer, so if you're interested, go for it soon.
Last, I'll state the obvious. If you make money with the 24mm TSE lens shooting anything vaguely architectural, or if you're a wealthy enthusiast who does the same stuff for yourself, get the companion lens to your 24mm TSE - the 17mm TSE - as well. It's an almost miraculous performer considering its incredibly wide coverage and complex construction; simply put, it can do what no other lens from anyone else can do.
Without knowing more about your "work," I can't think of any other good advice on the subject for you.
Again, good luck.