Propeller Modification from Engine Replacement for Tugboat

On tugboats, engine power becomes more of a selling point for the need to tow ships or barges. The selection of the engine and propeller must be matched with each other to get optimal performance. In this project, the engine on the ship is replaced with an engine that has a higher power. However, the value of the propeller rotation also increases so that the torque value that can be borne by the engine can be reduced. So I'm looking for a solution "how to modify the pitch and area of the propeller to get maximum performance from the new engine that has been installed". When working, it turns out that the propeller is predicted to experience cavitation empirically. So with all possible modifications, it does not produce a solution that can avoid propeller cavitation except by reducing the performance of the ship or engine used.