I ran it on a dyno this week, with the ignition advancer disconnected, and the problem seems to have gone away.So hopefully that's it sorted.