I measure around 31mm for the screw thread (tailcap portion), so I suppose the o-ring size should be 30mm or 31mm in diameter?