If you are having fuel starvations issues for a while now, I'm guessing you have a fungus/bacteria problem. Try switching the supply and return lines in the engine bay, that will tell you if your tank screen is the culprit.

__________________