Not to be...
a smartass, but I'd consider at least a "recut" of that 21 year old sail while you're at it. Bagged out old main can be one of your worst enemies in sailing performance. A competent sail loft could recut and give you full battens, loose foot, and possibily 5 or more years of life. I had a 28.5, '87 model, that really benefitted from a recut main.