My suggestion is go for an M6 and buy Voigtlander lenses.
The M6 is a more recent model and less likely to need an immediate CLA. The "classic" M6 has a standard .72 finder that handles all available focal length lenses relatively well. The current Voigtlander lenses are outstanding and are every bit as good as the Leitz lenses from a few years ago but cost less new than equivalent used Leitz lenses (generally). I have the 35/2.5 and the 21/4 Voigtlander lenses and they are impressive, especially for the price.