Well after many hundreds of dollars, 6 hundred to be exact, problem with my yamaha 250 hpdi turned out to be the fuel line pump ball. Dealer replaced all the filters, and was ready to replace the high pressure pump next.
On saturday was able to get to 5900 rpms and around 65 mph. Was on a very small lake and had to back off every run, was running out of water very fast.