Interesting reading this post. You are able to do a lot more tests than I am able too but mine has had similar issues. Is there any way of visually knowing the pump is aftermarket?
Ive done almost all manual checks fuel system related apart from getting injectors cleaned / rebuilt.
New fuel...