You can tap M3 in 4-40 size holes but not the other way around (M3 is bigger than 4-40), thats what I do for stripped K&B .21 threads. If you want to stay SAE, 6-32 would be better!