Just a thought but could the air in the system be coming from the tank? You mentioned the baffle is laying in the bottom of the tank. Could fuel sloshing allow the pump to pull air. Does the fuel level affect the problem? Login to read more.