I second the Garhauer rigid vang. The small version will work well on your boat.
As for the rigging, in additon to renewing the wire & turnbuckles, it would be very wise to check your chainplates very carefully on an older Cal, looking for elongated pin-holes and especially for any evidence of leakage on the underside of the deck and behind the chainplates in the bulk-heads. Loosing the rig to a ruptured chainplate weakened by crevis corrosion at the thru-deck point-which we have seen several times-will ruin your whole day. If there is any doubt, replace them. JSI rigging in St. Pete can provide replacement chainplates very inexpensively.
"It is not so much for its beauty that the sea makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from the waves, that so wonderfully renews a weary spirit."