Hrc ignition could be the problem with the over rev. The 21 flywheel is good for a couple of horses but not a true substitute if you want every last bit out of it.

Tom, did you not get a fair bit more when you went to the hrc card from the mc21 flywheel??