If you're in Canada and need work done on a Leica, there's nobody better than Gerry Smith at Kindermann (Toronto area): www.kindermann.ca
He did a fine and fast job on my M4-P.