Thanks for the nice reply. I've been driving the car for a couple of days now with multiple starts and no issues so far. BTW I've had good luck with used parts from Erin Auto Recyclers and currently have a complete left hand halogen headlamp unit in my garage that I got from them for $100 Cdn - all the adjusters inside it are good - let me know if anyone is interested since I managed to change the bulb in mine and don't need it. It should fit most S Types - mine is a 2004.
Changed the oil yesterday as well at Take 5 in Orangeville - another great place - $75Cdn for a regular oil change while you wait and sit in the car while they do it.