Well, after much research and soul searching, I got an XE-1. Lenses for it have all gotten good reviews and the lens map looks good. The colors appear wonderful after processing RAW files in Lightroom. It's the closest thing to my fond memories of my Nikon FM: small, light and fun to use.
Still getting used to it's personality but I'm off to a good start.