Re: If I had to get one new sail, what would it be?
I agree on Bacon Sails. They are quite conservative with their condition descriptions. Any sails rated 'good' or better will meet your needs and you should be able to get a genoa and working jib for the price of one new sail.
Finished the circumnavigation in early February in Grenada. Have to work on a book project for the next several months so the boat will be waiting for next year.