If you have an ae86 tank already , grab an ae82 in tank pump and install it inside the tank. Add a bulk head connector so the fuel doesn't seep back through the wiring insulation.
You won't have the baffels but the surge generally isn't too bad unless you are real low on fuel.