Ended up going through local diesel mech, got it overnight and didn't have to bother with core deposit. They got it from DTS.
I put clear hose on the primer/filter and had air coming through, ( before changing pump) but made no difference when I bypassed it. So I guess the diaphragm is cactus and will need a new one. As it still has air. I checked the filter again aswell.
I did get a Ecutalk cable, will have a play tonight.