A tap that large would be very expensive, especially an end tap, which is what you'd need since the depth is so short.
Instead, get a smaller metric tap with the right size thread pitch, and use it to "rake" the threads. That should help you find any uneven spots that you wouldn't find with a point tool like a dental pick.
Are you going to re-stake it, or use locktite? If you're going to stake it, use a bit of anti-sieze compound on the threads to help lube it a bit for installation.
Do you have a proper pin spanner, or did you fab something up?
mystic_1