I'd be tempted to do the pump rewire and the fan rewire purely for peace of mind to start with.
It is very easy to check the voltage under loadm, use some thin wire like speaker wire attached in the neg and pos terminal on the pump, connected to the multi metre in the car and drive.