GAmes have you ever had the pump off for a tune up or calibration? Would be a good excuse to get that done if you have to take it off anyway, in factory trim P7100s were hardly fine tuned for optimal performance (not HP wise but in terms of drivability & smooth operation).
Not sure what a tune up is. The closest shop I know of is about 80 miles from here. I've had mine set to 15. 7 for many, many miles. Other than that have not touched it.