I can recommend Kamera Service too (http://www.kamera-service.info/index.php/en/), they CLA'd Olympus and Pentax lenses for me and I am happy with the result. They can do all sorts of brands actually, not only Leica, Hasselblad and Rollei. Just drop them a mail to ask if they can do a specific item and for an estimation of the cost.
Another option is Photo-C in Switzerland, the guy had just finished one last time I was there... had the opportunity to handle the camera, very nice ! Drop him a call, his french speaker : +41 78 635 66 15.
Another option is Photo-C in Switzerland, the guy had just finished one last time I was there... had the opportunity to handle the camera, very nice ! Drop him a call, his french speaker : +41 78 635 66 15.