Hydramat will solve any issues with sucking air. With baffles you won’t really know until it is together and hit it. I have absolute confidence in the hydramat. Even though you car isn’t a race car it is suffering from a race car issue. I went from having to run over 1/2 tank down to 2 gallons in a stock tank with hydramat. I can run so little fuel that I have pulled it into the trailer, left it in the trailer for a week and the fuel slowly drains out of the hydramat and it won’t start. Shake the car a bunch and slosh the fuel and it will fire right off.