Return style regulator and an electric pump will solve your issues if it actually is a vapor lock problem.