The other way to fix the problem is to fit a baffled version of the tank from a car that was efi from the factory. Being in a wagon you will struggle to find the correct fuel cell, as a jdm ae86 tank probably wont fit like it would in an AE71 sedan. The VL pump will struggle to suck the fuel up and out of the tank, so you will need a lift pump to feed it. Surge tanks as above. Please post in the correct area next time. Use the search feature on each forum. Its magic. This thread will probably be moved.