I tried a 15 x 2 O ring which is the original O ring but in a Nitrile its too tight. I got it to work ok in 1 torch (tolerances obviously loose) but the rest I couldn't screw the cap on. I am talking the bottom end cap. The top seals are a different size and I have yet to touch them. They measure 20.35 mm x 1.78 mm but again are silicone which would be 019.
I might try the 016 for the bottom cap instead of the 15 x 2 and see how it seals.
Correction; The top and bottom battery tube seals are all the same size 019 will do it. The switch friction seal is different (26 x 1.5 mm approx)