Buy a jackplate.
Then you can raise your engine more and your prop is working in cleaner water.
the cavitation plate can be about 3 inch above the botom of your boat.
A lot of people will probably tell you that it is to high but just try it, you will see.
Most engines are mounted much to low.
And the engine should be mounted about 1 inch to starboard (because of the wheel effect of your prop).
then install a good hydraulic steering set like seastar pro.
you will see it reduces a lot of the chinewalking.
and off course a good prop will do a lot.
For me the tempest plus from mercury does the trick. (lots of bow lift)
good luck and sorry for my poor language.
i am just a stupid dutchman who likes to race.