All cured. Burgundymogs suggestion got me thinking about the wiring. A good squirt of electrical cleaner into the connectors and it cured the problem.

2004 Series 1 Roadster