I guess finding another o-ring will work but for a $130 light, you'd figure that woudl have already been taken care of.
I'm on the list for a AAA 2-stage cree, and will probably send my Raw NS in for an upgrade - love the nickel silver, and have a ArtOfTheHide holster for it in lizardskin.