Have you considered the other option? Buy a Leica lens, and buying a Zeiss or a Voigtlander Bessa body? Should you upgrade to digital at least you have the "glass".