I understand you saying ever thing was ok with the gen and reg until you replaced the engine, and then you started having problems.. roger that? and even with the problem your battery is still staying charged. I would think that with an engine switch you would have not messed with much wiring but..