Here's another wrinkle to consider-
Contax G1 or G2.
They're autofocus, with manual focus capability. They take modern CR2 lithium batteries. They have interchangeable lenses, and some of the best glass ever made for 35mm. They offer aperture priority or manual exposure, TTL flash, and they're quite compact and quiet (not quite as quiet as a Leica M, but still quite good).