Thanks Grinder.
What about using the AMC/jeep plug to connect it to the bike, instead of the original XS style? That way, if it does fail, you can just plug it in on the road without screwing with the wires, and return the old one complete to the store. Anybody know where to find the AMC...