Before you buy a new headset, check your stack height requirements. It would be a sad day to buy a new headset only to find that your newly powder coated fork is too short. Length of fork from crown race to top must be =>
sum of headtube length plus the stack height of the headset. Too long means you'll have to cut the fork, but you can't stretch one no matter how hard you pull.