Err -- how about a Minolta CLE? Aperture priority autoexposure, and full manual control. It has the 40mm lines for your 40mm lens. Nice viewfinder, very clear RF patch. I have a CLE, M2 and M3 -- OK, the Minolta isn't a Leica per se, but it is smaller, easier to carry, has the framelines you want, and fits your budget.