I have the Model 600. The original battery is a KP-18650-PAN29. I purchased an Orbitron ORB-2900-P Protected 2900mAh 18650 Li-ion Battery - Cell Panasonic NCR18650 - Protection ICs- Button top as a replacement. However, the Orbitron is shorter than the original. Who's have thunk not all 18650's are created equal?

Has anybody found a proper replacement battery for this headlight? Niterider offers one for $25. I suppose I can deal with that. It's only 2 1/2 times the cost of any other 18650 battery. But what kills me is that Niterider wants $16 to ship it !!! Niterider is based in CA and I live in CA. Out of principal I'd like to find another source.

Matt