I have the stock fuel tank in my 84 GTI with a Golf in-tank fuel pump (to mitigate fuel pickup problems) going directly to the main in-line pump.

Still have pickup problems.

I know fuel cells often use a surge tank to solve these problems, but can I legally use one while still maintaining the stock fuel tank?

I plan to use the surge tank from an 85 Golf.

Thanks!