Thanks Norm and Baz, I can buy taps for £2 each and dies for £3 for the smaller sizes. From Tracey tools. Just need to buy or make a tailstock holder for the dies.
I will replace eventually, as had been proved by my experience posted above I think I need to review what sizes all the bolts are and more important what the length of the bolts are