Thanks CC for the tip with Bathala, very good idea.
Perhaps someone finds a 22mm mech mod which accepts 18690.