agree, you need to run a compression test and an overall assessment of the health of your engine if these are your actual results.
I’m lost because planing your boat with a 17p prop compared to a 21p prop should be much easier, not harder, so even if the engine had low power, a smaller pitch...