I recently used a tap for this and it worked great. I've put 2K miles on the engine since I did it and haven't had a failure or leak. It took less than 10 minutes with the pump off the engine.

If at first you don't succeed,
then read the directions and try again.