As I stated before I have zero experience with diesels. I have plenty of experience with women, but am 37 and single, so can probably offer no good advice.
It was the CP3 pump. Got a Bosch remanufactured pump installed. $1,500 later and it runs great! Thanks everyone for you insight! Hopefully I won't have any other issues.