Originally Posted by
RubeRad
18650 batteries (commonly used in powerful LED flashlights) are not hard to find online (although I've never seen them in a brick&mortar store), and hold many many more mAh.
My local Fry's brick&mortar stocks 'em. My Fenix BC21R bike headlamp (with its shaped beam) uses one.