Did you ever get this sorted?
Same thing happened to mine. Same setup as you - HHB CDI and M-unit.
First my regulator went bad because it wasn't grounded well enough. replaced. then started getting weak spark and the coil gave out. replaced. Everything was running well for a while then...