Difficulty finding replacement throttle for ebike

[Hobocat]

The on/off switch (Left) no longer works on my ebike, the (Julet?) connector is red with two pins. I can;t seem to find anything similar to replace it. Also the throttle/battery indicater (right) is sketchy & uses a 6 pin higo, also can’t match up a throttle with this pin configuration. Not sure the configuration they did is correct….would like to upgrade both. 36V 7aha BMX . any advice…cheers.
Jamie

 

[Chuy]

Did you sort this out? If a two wire system, cut off the connectors and splice in an aftermarket on/off switch. I see many switch options on amazon; keyword: eBike on/off switch.