PIAA Night Tech are good bulbs too, have some in my E46.
With the Saff, make sure the reflectors are good too, but you know that anyway!
I relayed the lights in my mk2 Golf, 2 relays, one for dip, one for main. Used the old wires to switch the relays.
If I was going to do it again , I'd deffo put the relays inside the car, had to replace a couple on the Golf from getting corroded, but they were in the engine bay so not suprised