Light problems - cable advice on replacement

I had the same problem and solved it by snipping off the nukeproof connectors and replacing them with Magicshine connectors. I soldered the wires then sealed them with glue backed heatshrink tubing. For the magic shine connectors just buy an extension lead. You will need to leave the Nukeproof connectors on the battery and light head in place, I actually glued mine using epoxy bond. I also replaced the handlebar mount for a Magicshine version too. The upshot of this is my light works perfectly and I can use any of my lights with any of my battery packs. I can also use the Nukeproofs smart charger to recharge my Magicshines.