There is another option that's got me split in different directions......
The fix I am in is similar to the OP about wanting more but distinct in other ways. I shoot the XT-1 and I need more Mpx for larger, clearer prints and general recomposition in post. I love the XT-1 otherwise. I just want the sensor to harness the full potential of the glass, the awesome glass system fuji has built.
I briefly used the uber expensive Leica Q and just couldn't not notice the lack of sharpness / clarity or whatever you would call it in the prints I have been making with the XT-1. For some reason with the same work flow my prints with the leica Q while in testing blew up better than the XT-1 with comparable settings. I'm not pixel peeping here but the resolution + clarity of the Q sensor & glass pairing resulted in better image production. Don't ask me how. I love fuji so much that I realise I didn't want to admit to that bit but I have great hopes for the X-Pro 2.
So, I have been really on the fence about adding a Leica Q to my pack now or wait. I can never ditch the Fuji because they are the right middle ground for this era in Photography but envelopes need to be pushed more once in while, which means more aggressive sensor development. Add to that, I love the X100T and I really think its the best camera for me in the world and the Q really is its only true competitor except that I love the OVF for the X100T and leica doesn't do that in the Q price point. That is a huge consideration for me. The OVF/EVF mix is magical. It makes me use my X100T more than the XT-1.
Do I need a Q? Yes. Can I hold out for the X-Pro 2? Ofcourse. I have been for ages now. Just a higher resolution and slightly more clarity and detail in the RAW files would make it to me the best camera even compared with the Sony's.
The Sony A7Mii and Sony A7RII are both not discreet cameras. They are still plenty noisy when being operated and hardly inconspicuous to people. With large lenses a pain too. So colour, lens range, tech and price aside, they are cameras you will get good images out of but having tried them out, I can guarantee they will mess with your good chi. You'll say great pics but man it's nikon level effort to use them. Trust me, I have had that feedback from many many of my friends.
So to the OP.....its just a few more months.....see what Fuji has to offer if not I suggest you take a look at the Leica Q. It does everything you want it to do and does it really well.
OMG! Just downloaded and tested the auto focus even on the 18mm F2 & 35 1.4 lets just say the focus is stellar. Fantastic job. So far the highlight is the improved accuracy in Zone and ofcourse the absolute overhaul of multi point focus! Thank you so much Fuji. You rock the socks of Kaizen. Much love and enjoy this update everyone. If they stopped updating the XT-1 today onwards, I'd still be super happy going forward with how the XT-1 is now. Matt