Do NOT change ANYTHING until the rust is well gone. You need to redevelop your skills so that when this time comes, you can actually tell the difference.
The biggest advantage of a new shaft is that it is free from dings--no really.
Whether wood, or CF, or kevlar/glass it really does not matter...