I'm starting to think my project won't ever get completed. I am not aware of an of the shelf solution. Some have sent their barrels out to be threaded for chokes. A few (very few) have had adapters custom machined. M21.5x.75 is what you're after. I ordered an M22x.75 tap and the fit was sloppy.