I'm happy to hear you are going to stick with BSW so you will need a 5/16th BSW tap