I emailed customer service over the weekend (they got the same info I posted here) and got a response this morning. The said send it in for repair or buy a battery and they would assist if that didn't fix it. The latter is best for me since I commute by bike every day. But...I looked at my battery under the microscope at work today and the "wear" marks had a dark appearance. So I scraped with an exact-o and found that that dark stuff came off. So I scraped until the whole area was nice and shiny. I disassembled the light enough to get at the mating contacts also and they looked okay. I'll be riding home in the dark tonight and I'll post results tomorrow.