Didn't read your whole post so i retract what i posted
A new tailcap would also be needed for a 20700 body. I don't have my calipers but i think i agree about the 26650. I don't think there is enough material at rhe largest part to accommodate a 26650. Bore would have to be 27mm most likely plus material for the body.