a surge tank i whould recomend or get your tank baffled and foam filled which will stop the surge to you get downto the last 10l is say but a surge tank gives ya a bit more protection and probly cheaper to.
as for fuel line id run 7/16 or bigger cause then you'll have as much fuel as you'll want and if you go power hungry later on you wont have to upgrade it again
mark