You didn't say where you sail, cruise, race, off-shore, single hand, want
furling?. All are important to sail choices.
Catalina did offer some sail choices at times, maybe not in 84, but yours are not necessarily factory anyway. main and 155 are fine in most locations. You may want a
jib for windy conditions.
glassed in pipes and gate valves should be replaced. Have you checked the web site yet/ Best upgrades are listed under FAQs.