Heard back from Fuji after 5 weeks. The X-H1 will be replaced, they couldn’t repair apparently. Afraid they were not open to discuss the possible purchase of an XT4 with a discount and them keeping the XH1.
So I’ll have a new X-H1 and an X-T2 again. Not sure if I’ll keep either of them really. Might sell both an go for the XT4. I do however, very much like the grip of the XH1.