Does it have to be a 21700 light? If you want good runtime, a 26650 cell will typically have more capacity than a 21700 cell. Convoy S11 looks like a decent budget 26650 flashlight.
https://budgetlightforum.com/t/-/56383