Suggest you might be getting a little ahead of yourself. Probably better to wait till you get the light. If they're actually 18650 batteries those are available in different capacities and in both protected and unprotected configurations. Why add something on that can be built in? Never heard of anyone selling products on eBay with quality batteries so you'll probably want to change them soon anyway.