Hello,
I am thinking in a similar direction. I re-started doing film almost three years ago. Shooting digital is now just for family events , kids at home etc. - more reporter style. I got used to rangefinders with my Leica film M.
I decided to try an X-Pro1 with 27mm to see if I like it. If so, I might upgrade to an X-Pro2 and 16/35 or so. Eventually, the D800 has to go. I never liked it as much as the D700 I owned before, anyway.
Lars