Eighteen months later - I think it's fixed!
The LCM (attached to the light switches) had some corroded connections and visible damage to the circuit board. Many thanks to Tom Force for spotting this and also coding in a replacement LCM during my visit.
It's all still working
