yeah the worst is over so long as the pain doesnt get any worse haha.

face lift headlights use different connectors mate so a bit of rewiring wil be required.

hopefully your relays are ok and its just the battery needs a good charge over night or something. you could try wiring the pump direct to the battery just to test the pump is working. if that works then get the batery back in the engine bay and start fault finding.