coming from three fujis (x100s, xpro1, xt1), a bunch of their lenses, and now a bit of experience with m240, two things you said resonated with me;
-a camera that gets out of my way
-manual controls
No matter how much i tried, I could not get excited about the OVF's. Always having to rely on AF and never really knowing what locked focus was just too much for me to get over. I really really tried to like the OVF, theyre wonderfully bright, accurate framelines, lots (sometimes too much) information, but I cant get over my issues. As such, these have been used primarily in EVF by me.
To that end, the XT1 is the one I'd probably suggest for now, even with the new Xpro2, just because it has the bigger EVF. You could also wait for the next XT generation. The only caveat to this is if you feel like doing lots of high-f-stop zone focusing where you can forget about focusing or af and then just use the framelines. My only caveat here, is to just stay out of the menus. The new and improved XT1 while significantly more capable, is also more complicated than when it was first released. So many AF settings, tracking settings, face detect, eye detect, and certain things when used together dont work well, and trying to remember it was too much for me. I recently sold mine it became too much to bother with. (and I'm not that old...hah)
Otherwise the x100t might be a fair option, especially given its size and wonderful lens. I've no experience with the faux-RF patch in OVF mode, but it seems like it might be OK. Some people say it's gimmicky but I dunno. The Xpro2 with M glass and the "RF" patch might make for a fun experience as well.
For native fuji lenses, i'd recommend the XF14 for its small size, lightweight, amazing performance (sharpness and distortion), and the clutch focus with DOF scale almost feels manual to me. The XF23 also has that, but I never quite warmed up to its rendering and size\weight. The 23mm on the x100 series is really special imo. Its nice with the WCL as well. The TCL always scared me away due to its size. Otherwise, even after the firmware upgrades that "fixed" the pitch of the fly-by-wire focusing, i never liked how the non-clutch lenses focused. They're OK for doing small adjustments when using AF+MF but to go from infinity to a few feet, bleh. Awful imo.