I will chime in my recommendation for Gerry at Kindermann in Toronto. Though not inexpensive, the work and turn-around-times are very professional. I have used Kindermann for CLAs on both my Leica M bodies and M-mount glass.