And then there's the possibility that the pump pressure is off.
If the pump output pressures are not right you will always have one problem or the other.
THEN when I did the 5.9 swap I built this to allow changes in the geometry by moving the attaching point of the TP cable in a slide.
(just some options that might help or even give you some ideas)