I would check the ECM and make sure it is not due for a recalibration.

Also I was wondering if there are any problems under load? Maybe the fuel pump. What does the pressure and volume look like. Have you checked the EGR system?

Are there any fault codes? Login to read more.