Steve, I'm not sure if my usual mechanic had removed the top of the carb while adjusting it so I'll ask him in the morning. I had it rebuilt recently, but if he was messing around in there at all, i'll have this new guy check it.
As for the wires, I've checked them and they're in correct firing order (1-3-4-2) according to my shop manual.
I've just ordered the ignition relay
(001-542-28-19) from my dealer and it'll take about a week to come from Germany. Hopefully I can get back on the road by then.