Don't understand why headlight motors are running your battery down. Perhaps someone else can give you a clue. As far as Barney's "Kits", they are great. Much easier to install than I expected. Took about 1.5 hrs to do the first light, (including find tools, grease, beer break, etc). Should be able to do the other side in less than an hour. Good luck.