I use UltraFire 880 mAh protected 16340s from batteryjunction.com (not sure if they're back up again after their recent fire, but I believe those are available at other online batt stores in the US too); and also AW 750 mAh protected from lighthound.com, which are said to actually last as long as many (most?) others claiming a higher mAh, since their claims are actually accurate. Also said to be the safest/most reliable ones available. They're a little smaller too, which works out well for my circa-December GLV, in which iirc the batt tubes are narrower than later models are.
I've been using both with the UltraFire WF-138 switching charger, and recently got the one smokum mentioned too, as that one also charges 18650s which I needed. (The WF-138 also charges 3.0/3.2V rcr123a, which I needed as well! Decisions, decisions!)