The 18/2 Fujinon is one of my favorite lenses. It was meant to be a reportage lens. The 18/2 was FUJIFILM's first compact design that was not a pancake lens. I do not consider the 18/2 to be a landscape or architectural lens. I wish FUJIFILM would expand the new 50/2, 35/2, 23/2 line to include an 18mm lens. I would pay for this update.
If you want an experience similar to using an analog rangefinder use an X-Pro 2. If you work at a leisurely pace and don't need fast, flexible and precise AF, the X-Pro 1 will do.
If you are comfortable using an EVF, I think the the XE-2 would be better than the X-Pro 1. The XE-3 would be best.
The X100 was an experiment that succeeded beyond anyone's wildest dreams. It was the seed for the X series. The X100 was conceived as and designed to be a digital Canonet QL-III. While FUJIFILM has done an excellent job with the teleconverters' optics, I rejected using them because I felt they changed the handling for the worse.
If you decide to go with the X100, I recommend the X100T as a compromise between cost and performance. However, I think the X100F is worth the extra money.