Since you're already considering replacing the pump, have you considered a complete solar setup. I'm running a solar pump that is completely powered by two 75 watt panels. The only real downfall, other that no sun, is that it only pumps to the storage tank during the day. No batteries and no generator needed. You might want to look at the Sun Pumps line.
