It sounds like you enjoy the process of shooting with the X100 more than a film camera. Frankly, I shoot much more with digital because of the convenience and my growing ability to postprocess to my liking. The only reason I shoot the M7 is when the M9 is in for service, or if I want to enjoy the tactile experience of shooting a film M.
I shoot the M9 very avidly, and I have also been looking at the X-Pro 1 as a lighter camera with interchangeable lenses. It feels pretty good, but the quirks of its autofocus make it a little annoying at times, compared with the manual dependability of rangefinder focusing. In 30 minutes of playing with the X-Pro 1 in the shop, the camera missed focus many times, even on things that should have been easy. You never have that problem with an accurately adjusted rangefinder.
The Ricoh GXR-M works very well for me. I love the compactness of the camera and the excellent files, and the ability to use M-lenses or autofocus modules of similarly excellent quality. If I had to build a digital kit with a non-M9 budget, it would be the Ricoh GXR with two aps-c modules, the M-module and a handful of Voigtlander and Zeiss lenses.
You already have the lenses, so perhaps you could get a Ricoh GXR-M and see how that goes. It's not rangefinder focusing but surprisingly close, the footprint is much smaller, and the files are super. IMO they have more character than the Fuji X100 files, although not the same high ISO quality. The GXR has very fine luminance noise at higher ISO's that is reminscent of film grain, and the files convert to black and white very well, too.