Bruce,

In 18+ (and for sure in 25+) it's worth bringing up the plates even more - From the Pic it looks like you have around 9 to 12" of plate up - try more, the boat will then settle down and be much easier to drive over and thru the waves.....