So, just to clarity, the recommended solution is to install the upgraded RR AND modify the wiring? I'm also having problems with my charging system and ordered the upgrade kit, but want to know if I should also plan on modifying the wiring when it shows up.