My suggestion is to either get a Kyosho surfer dude or one of those wave choppers or I have also seen Jet Ski replicas, all of these are self righting boats.
No matter how many adjustments you make or how hard you try not to, in 1 foot chop, the boat is going to flip sooner or later.