From one of your follow-ups it looks like the engine is not original? If so, why bother with the mechanical pump at all? Consider blocking it off and just going with an electric mounted as close to the tank as possible.

An electric pump should have a circuit... Login to read more.