I bought my X-T2 several years ago for the same reason.
Speaking of grain. The Fujifilm sensor actually adds quite pleasant grain at higher ISO. So I sometime shoot with deliberate high ISO because I like the look that comes out of it.
I am a little jealous on your X-Pro3. The X-Pro3 is high on my wishlist :)