I thought I found you a trim nut to use. So you don't need a tap? I know you want to "re-tap" the choke retainer because it has the wrong threads for the toggle..
So I guess the nut I linked is a back up plan.
As Otto says, plenty of taps available.

Right is right, even if everyone is against it, and wrong is wrong, even if everyone is for it. - William Penn