I have a 99 I can keep it pasted at 7 grand and have no problems with some ripple on the surface, until I catch a small wake and it porpoise city. Then I just drop the throttles back until it stops then drop the hammer again. When the water is smooth as glass it's a little more prevalent. The problem is there is not much boat in the water so it doesn't take much do cause it to do it. Trim tabs would help resolve the issue, but with the shape of the hull back there it's all but impossible.
When you are getting the porpoise effect is the bow just bouncing up and down smoothly or are the pumps loosing water and your bouncing off the rev limiter and it feels like a bucking bronco?
Do you have any water in the hull, ski locker etc.... Have you tried anyone in the suicide seat (front seat) to try to get a few more pounds up front to keep the bow in the water a bit more(would be the effect of trim tabs). Perhaps I don't see it as much as that is my sons favorite seat and he's probably 50#. The boat does like a bit of ripple on the surface for sure, and then there is the chop you have to contend with, where an extra couple of feet added length of the boat would be better.