The Fuji X-pro 1 is still the closest/only approximation of the Contax G2 in the digital photography world. What would you switch to in order to get closer to that goal? I mean, something like a used Leica M8 would give you an actual rangefinder, but you would lose AF. I assume AF is important to you as the G2 is AF only. I own a G1; the fact that it is AF only is my one big complaint about the camera. With the Fuji X-Pro 1 you get 1) rangefinder style body, 2) OVF, and 3) both AF and MF. I went with the M8 and love it, but, you know, there is always the $ thing associated with that camera.
Thanks for the great OP, it prompted me to join the group. Maybe the X-Pro 2 will flip more of your switches.