If you're getting bow steer, there's too much hull in the water. As you surmised - and as mentioned, get the bow higher. I'll add that sometimes, when coming down the wave face, you need to back off throttle a bit to let the stern squat and not plow into the next wave. Then throttle up again...