Putting an electric pump back by the gas tank, shielded from exhaust heat, is the best way to eliminate vapor lock. Remove the mechanical pump. Run a return line to move a little fuel all the time.

R.