Suggest using Limeaway in the future for clean-up. Quicker than CLR.
Not sure if this is the cure, but most boats come with zincs. For freshwater use, you should be using magnesiums instead. Other than that, I know of nothing to prevent it. BTW, cavitating the prop etc. did not cause this, it's the hard water.