Huge up vote for Youxin Ye and his Leicas. Forget ebay though and just google him and email directly. He has a load of non-working Leica bodies around just waiting for a CLA and/or fix up that he'll quote you for. Got a great user M2 from him this way at a very nice price and have a IIIF RD on the way too that he CLA'd, installed a new beam splitter and replaced one of the shutter curtains, again for a very fair price.
I also have a Certo I bought from the certo6 site too. Same accolades.
More expensive vs eBay but not a crap shoot either.