So took it for a long run, it pops a bit on idle but generally it's actually running pretty sweet, occasional cough and splutter, but significantly better than last weekend.
That would indicate I'm in the right area, plugs, leads dizzy cap etc. Will see how it runs when the plugs and leads...