Hey Cervin, have you thought about putting in a new stator? The newer ones are more powerful, have fewer electrical connections (you can get rid of your rectifier/regulator) and will allow you to run a modern headlight and have better charing for your battery. BTW, I like that taillight combo...