the electrics on these bikes are awful for this.

As the better fix I'd either remake the entire block or just strip it all back and clean it then crimp on a new set of pins and heat shrink them and then tape them up and forget them.