I've got a 1st gen Magicshine, and after a year and a half, the cables have given up near the connectors, from twisting to try to undo them. So, I plan to buy a couple of replacement connectors, and replace both those on the battery and light, and those on the charger (of course). Any suggestions for a reasonably priced, easy to wire connector that will be sufficiently waterproof, and ideally, require no twisting?