Yea i would take your shot off solenoid out and remove the plunger. reinstall the solenoid without the plunger. if that does not fix the problem then i would probably check out the lift pump before you went through the trouble of having the inj pump gone throught again. I had this same problem and it was the pick up tube in the fuel tank was plugged.

 

well guys i found out the problem i had switched the fuel supply bolt with the fuel injection pump return line

 

good deal. glad you figured it out. sometimes those are the hardest problems to figure out. good job