Received my X-H1 back again this morning, so was apprehensive as to whether it was actually fixed this time
On first inspection, what do I find, but a cracked lcd screen, my heart sank. WTF!!! Back on the phone, I spoke to a softly spoken man, who was very apologetic. Then it suddenly dawned on me, I had a glass screen protector covering said screen. Doh, what an idiot. Anyhow the upshot is they are going to reimburse me the cost of a new one, so well done Fuji. Shame about it getting cracked, but a huge relief it wasn't going straight back.
On sending it back the last time, I wrote a short list of things that were annoying me, such as the very stiff on/off button, now fixed. The body is also a different one, well from what I can tell. There was this slight imperfection, just above the rear command dial, which is now no more, but the serial number is still the same, so yeah. They have also this time answered, the question of what they have actually done, in this case replacement of the main circuit casing, so again, well done Fuji.
Still haven't had time to check it out fully, but here's hoping, third time lucky.