Jon, sorry, been away getting married.
My problem came back.
Now I had replaced the TPS and the OE TPS was out of spec. I checked the replacement TPS and it was in spec.
MAP sensor under the tank was in spec.
IAT sensor was in spec.
I replaced the O2 (lambda sensor) and problem remained.
In the end I removed the O2 sensor, fitted a bung and a loop for the plug and the bike has been running fine since.

Electrex do a coil that is in size spec, but the primary resistance is different (lower) than the listed Haynes value.