Thanks for the suggestions everyone but I ended up taking the quick and easy way out. New complete unit being shipped from Mercury this week. Just under 8K installed. Local marina doing the work.

I should be back on the water by next week. If I get another 28 years out of one, that'll be OK.