Check Lareoke's website. He uses a vibratory parts cleaner and various metal treatment kits from Eastwood and if I was doing what you are, I would treat all my nuts and bolts that way. It makes them like new.
His website is all over, check links or previous posts, or profiles. Good luck. Others will comment on the die set I am sure. I want one too.