Sounds like too flat a pitch to begin with. Our 40 Ocean has a 17 x 15 L 3-blade propeller, Volvo part 21381279, and I believe that is the original one. The first number is the diameter in inch, the second the pitch (in inches forward travel per revolution).
Our MD22L-B does not revolve anywhere near that high when under load. I think it's doing about 3k at full throttle, but I might remember it wrong. Anyways, never over 4k!
Would try the above prop, it's likely the same for your 42 Ocean with the same engine, unless maybe your saildrive has a very different ratio (ours is a 120S-E).