Whilst I can't answer the real question, I'd say that junking the 16 electrics in favour of at least a PGMII is probably the way to go.

The 16 CDI's may be ok but I don't know the timing curves.

Sure it wouldn't take too much to fit the stator and flywheel off an MC18 to get the PGMII running.

Or fit an aftermarket CDI if you're looking for big mojo.