Try a 3 blade
I have both a two and a three blade prop for my 86 TR w/Universal 25. The exact pitch for both escapes me at the moment, but I do know that each is pitched appropriately based on conversations I've had on this forum. Both blades get to roughly the same top speed under power. The three blade gives me more thrust in headwind/seaway situations, has more prop walk both in forward and reverse, and shaves about .5 of a knot off of my speed under sail. That all said I've had gust of wind and a wave or two stop me dead. Not sure on the wind speed but if I had to guess the steady state was 20-25 (once under sail I was double reefed with no jib and 20-30 degrees of heel) with gust to 30. The waves that stopped me were green coming over the bow so I'd guess 4-6 feet. Anyway, it's all about trade offs. Get a three blade, try it out and then you'll have a spare no matter which way you go.Tim