Bait board and under floor fuel tank.

[stub]

Yeah personally unless you have range issues or space issues I'd be running tote tanks your drawing is spot on I wouldn't make you expansion chamber any smaller than 2 litres and make to return line to filler as close to your fill point as possible so you get a similar effect to filing a car