Recently acquired 35-3 with Universal M-25 engine. It has been stalling out after 30-45 minutes of running. Noticed the primary (lift) pump was running hot. I think it's time to replace. Questions: 1) What is a good replacement pump? 2) Current pump is mounted above the tank, should it be moved to a lower position in engine compartment?