Would an M5 (which I think is an 8mm) tap fit an 8-32 blade retention screw? Also what would be the best drill bit?

If not, would this one work?: http://www.ebay.com.au/itm/Tap-and-D...UAAOSwpLNYBXZt

This is the blade retention screw I have: http://www.thecustomsabershop.com/8-...crew-P538.aspx

My local hardware store only has M5 and upwards, but I think I'll need an M4.

First time builder by the way, so sorry if it's a stupid question.

Any input would be appreciated.