I think I would go with a 24mm they usually are +/- 1mm (I think) if that's the top of your opening. I think it would be difficult to drill out or file out the 24mm side of the cap to a larger size...