Just get a stock replacement pump. The $70 WBS pumps are decent.

As for the rest of the car, just leave it alone. Once you start modifying it, you will have to keep fixing it when those parts fail.

I would just go with regular maintence. Thermostat, plugs, and wires.