Welcome to BLF Terry,
The answer to your battery question will off course depend on its application - but a good high-drain 18650 battery at a reasonable price is the Samsung 30Q. Available in both flat-top and button-top. Just my two cents!
Edited:
BTW, one of the greatest tools I have found for shopping for flashlight-related items is the BLF Chrome Extension. Take care!