Racetech has a great website (although looks very dated) that gives you spring recommendations based on your skill, riding style, weight, etc.
When you rebuild your forks, it would be worth looking into getting their springs. See how you like that set up, and if you want further damping...