Pumped up the tires, moved the rear wheel back a bit tightening the chain, put a new o-ring on a bolt, zip-tied a loose cable, and then went out for a blast.
First ride since November I think, it was damn cold but great fun. My rpm issue seems to be fixed. I can consistently get up to about 6000 rpm so I'm happy about that. No faffing about with the points anymore either!
I need to move onto some other fixes now though. One floppy indicator, a slow oil leak, and a problem with drinking too much oil.