I agree with the both of you. The biggest leap forward is the X-Pro 2 but I can upgrade from the X-T10 to the X-T20 (and enjoy both improved autofocus and 4K video) for the least amount of money.
As for the X100F, I wrote in another string that this camera's switch to the larger W126 battery, while a good move on its own, messes up my travel kit that includes the X100T and the X30, which share NP-95 batteries and a charger. Nice and compact. Besides, the shooting I do with the X100T probably wouldn't take full advantage of most of the new camera's features.
So, for me, I think the upgrade order will be X-T20 fairly soon, X-Pro 2 in the medium term (maybe end of summer, Christmas or whenever a decent sale occurs) and then (perhaps way down the road at close-out time) the X100F.