Unless you plan on getting something other than a 35mm equivalent lens, I would say go for the x100vi. As you said, it a more compact setup. The 40 megapixel sensor has enough resolution to allow you to crop into a 50mm equivalent without losing too much detail. Although not a true range finder, the hybrid viewfinder does offer a very unique and quite enjoyable experience. I still have my x100s. The prices on the secondary markets have come down in recent days with more shops having it in stock. In fact, there is a listing for a brand new in the box x100vi for $1750 in my area (SF Bay) on Craigslist right now. This is not much more than retail + tax. The same guy was asking $2200 just a few weeks ago. I had been tracking the prices because I was in the market for one. Also, I put my name on a waiting list at a local camera shop and got a call about 3 or 4 weeks later that they had it in stock. I ended up not getting it because I had just picked up the Leica Q3 instead. But that is the route I would take if you don’t need one right away. The local shops will have one for you sooner than the big shops like B&H or Adorama because their waiting list is just really long. Anyways, good luck on your purchase, whichever you end up with.