To be honest:
Fuji is the only brand who takes APS-C seriously. If R7 doesn't come and X-H2 arrives I will probably go for Fuji.
I hope this won't happen because transition costs and I will miss some lenses badly.
I have also had my eyes on Fujifilm, however their AF is just not (yet?) anywhere near the performance I want.
Lately OM has caught my attention with the OM-1, and I wonder if I would feel the smaller MFT sensor would be good enough for me? For most photography I do definitely care more about optical quality than sensor size, so maybe?...
Maybe OM-1 is not yet completely where I ideally want it to be, but OM definitely seems to be going in the right direction (for me) with that body.
But if Canon gives us that R7, I can stop wondering about that for the next 4-6(?) years. As for lenses my existing EF-S will do fine for the time too, if Canon doesn't launch anything more attractive than what I already got.