If you're in the market for a new prop, I suggest you take a look at the Campbell Sailer
West by North Enterprises
I installed one several years ago on my Yanmar 2QM20 engine and have been very satisfied with its performance under power and sail. They will size it for you if you give them your boat's engine specs.
Regards, Ken