Sounds like the OP has a boat that can float even with 50% power. Your advice is good and fits most sizes and I would like to present the flip side of the coin

Sounds like the OP has a boat that can float even with 50% power. Your advice is good and fits most sizes and I would like to present the flip side of the coin: 10 years in the game is a lot credential wise and I think could be an opportunity to refit at sea and decide a new course. It really depends on what risk OP and partner are comfortable with. Thanks everyone here for their inputs.