Yup, I did that, and they are indeed awesome. I called and explained, saying that it's out of warrantee. He said it would cost $20 plus parts to fix. But then mentioned in passing that I'd sent it in for warrantee repair before, so he said that they extended the warrantee, and they'd repair it for free. I sent it off yesterday. The only trouble is the turnaround with shipping will be about two weeks.

In the end, if anyone cares, I ordered a Light and Motion Urban 500 from Amazon, though it costs $20 more. L&M lights seem to get consistently good reviews. The build quality looks good, and it's rated as waterproof according to some standard, which now seems important . The medium setting is rated at 225 lumens, which is closer to the setting I use most of the time now, with a 3 hour run time, vs. 380 lumens and 2 hours. It's also more compact, which matters because I'll be using it on two folding bikes, so handlebar space is limited, and the light is less likely to interfere with the fold. I also considered the Niterider Lumina 550 (partly to reward them for good customer service), but it's really bulky compared to the L&M.

I tend to obsess and over thing these things, but I think I'm good. Thanks for the input.