Hi Ralph, if you compare some high current 20700 like the one from Molicel, you will see, that they have 20,5 mm - 20,7 mm Diameter....it is almost 21 mm diameter and would fit in any 21700 Mod I know.
It is my personal opinion, but I would not use any high-current battery, that I don´t know...