I have read this thread several times and like has been said things are not adding up right. However I think there is also a confusion in the terms being used. I think while he is saying cavitation, I think what he means is porpoising.
He first said
"The reason i put the fin on there is because without it the boat cavitated so badly it was hardly enjoyable to ride in, I attribute that to hull design I guess. Put the fin on there and its smooth as ever so I wont be removing it."
Then later said
"Without the fin I couldn't come off just about all the way down without it bouncing all over the place."
That doesn't sound like cavitation to me, that sounds like porpoising (though I am no expert).
Second he says
"the 3 blade is a quicksilver 19p that looks like it was damaged before and reshaped"
So we don't know if that prop is even at factory spec or what particular Quicksilver prop it is (could be just a basic SS).
While I am still new, I was told by one brand that prop pitch can vary between brands. That being said, it may need the 21P if I understand what is all being said and he is experiencing.