MK1 Caddy 1.8t Fuel System

Hi Everyone!

I am coming towards the end of a 1.8t conversion on my MK1 Caddy, however ive noticed that my current fueling setup doesnt seem to be good enough for the 1.8t engine.

Im currently using the original Caddy fuel tank connected to a Bosch 044 style fuel pump (Fuel Filter inbetween of coarse) and then to the fuel rail.

I was thinking of either fitting a lift pump to the caddy tank in order to keep a consistent flow of fuel to the high pressure fuel pump,
or removing the caddy tank completely and putting a race fuel cell in the bed so that the pump is gravity fed.

If theres anyone whos done this conversion to there caddy can you let me know what your fuel setup is.

Thanks for any help in advance.