Remember the X-T2S may well arrive next year with IBIS... https://www.fujirumors.com/fujifilm-x-t2s-ibis-camera-will-ship-first-half-2018-will-announced/I think this is my current school of thought. I've put in some requests to MPB and Wex and the quotes for a D800 and 70-200 are pretty good, so I see an XT2 in the near future, as well as keeping the other D800 and lenses.
Just need to decide on a lens to go with the Fuji then