Hey Keith I just worked on 6.4 recently that had water in the fuel contamination. The customer knew about the condition but just drained the separator and continued to drive it. It only had 6000 miles on it. Vehicle was brought in with a lack of power complaint. It felt like it had a governor when driving it and would not exceed 2500 rpm in any gear (manual trans.) This thing idled perfectly. IT set the same codes youve listed and code for water in fuel. What I noticed is that short term fuel trim rates at an idle were all over the place. From -18 to +14. I also found on enhanced power balance that when I removed pcm fuel correction that the engine idled rough. I repaired the low pressure fuel system first for water contamination and then replaced all eight fuel injectors,high pressure pump, both rails and fuel cooler after flushing system. I know enough gas in fuel system and driven long enough can do the same damage. After repairs vehicle now has normal power and performance.