I have recently replaced a RR and generator after tracing a non running bike for two months! No expert by a long way but certainly know enougj, where you based, can take a look? Google Electrosport and follow their guide