I would look into Bodo up at Halton Camera in Georgetown. The last few times I was in at International Camera Stan looked like his heart was just not in it anymore to run a storefront operation, I have heard speculation he would be working from home but treat it as that, speculation.

Another option would be Winball Camera in North York, they did amazing work on my Nikon F Photomic Tn two years ago, it's better than new when they were done with it.

For those with Leicas and Rolleiflexes, I highly recommend Gerry Smith (no relation) up at Kindermann, even he is working part time (three days a week). I have my M3 up there right now and I know it will cost a small fortune but to have a factory trained Leica tech work on it is worth the fiscal pain.