Gen 1 AIS Removal question

[Fazerjon]

I've been looking at the various ways people have gone about the complete AIS removal process, and I have all the plastic bungs/plugs for the hoses & air box etc. I bought the removal kit from TPO parts, but when it comes to the outlets above the headers, these need to be completely removed from the head and the plugs supplied pushed down inside the holes, which means once they are in it is non reversible. The Ivan's kit comes with a 5/16-24 tap and bolts. The metric equivalent to that is M8 x 1.25 thread. So at last my question is, has anyone done this using an M8 tap and put M8 capscrews in, instead of 5/16-24?