Dan,

I use Gus Lazzari at TLC Camera Repair. He's on the "other" coast from you.
http://tlccamerarepair.homestead.com/

He did my M4P and a few lenses for me. 100% professional and is a frequent contributor on the Leica Internet Forums.
Best of luck,

Carl