Here's my last bit of advice ...

Take the boat to lake and see if it will get on step with just you in the boat. If doesn't ...

Take it back to the dealer and tell him to fix the motor and forget about props and trim tabs.

Good luck.