I once had a Golf with the same problem/symptoms.
In the end it was that someone had put the fuel feed to the fuel pump onto the fuel return line into the tank and vice versa. The fuel return line drains into the tank from half way up whereas the feed obviously feeds from the bottom...
might be worth a look.