Bob -
If you have to replace the header pins on the board, don't forget to replace the pins in the connector. They are going to be just as bad. GPE is a good source for pins and tools, although there are others. Mostly a matter of personal choice.