Yeah, with flashlights, 20700 is going to be obsolete well before 21700 will. IMO, it’s already obsolete.
My progression in cell size is AAA, AA/14500, 18650, 21700, 26650. Yeah, there’s sizes in-between, but with the exception of CR123 you’re looking at fringe sales that might disappear at any time.
My order of obsolescence is
26650 (it’s really only supported by custom manufacturers)
14500 (same)
21700 (this is a guess, but if Tesla goes bankrupt, the demand for this might plummet)
18650 (large base for this, but it’s not a consumer cell so it will probably go away at some point. It’s better for heat dissipation than 21700 though.)
AA/AAA (These will be around long after humanity has wiped ourselves out. The robot civilization will still use these.)