Thanks again everyone, a few more things to think about.
I do now wonder about the air suspension side of things, I did the swap on mine about 5 weeks ago, 3 weeks before this fault started but clearly the relay charging could be related. I disconnected the main relay and fuse for the system...