Dave
Had similar problem with my S-Type. Changed bulbs to RING Xenon 200. Also checked the height that the lights were set at and found they could be increased higher slightly without causing dazzle problems. The bulbs are readily available from the likes of Ebay etc. and are legal compliant.
No problem with dazzle , people flashing at you, or seeing well myself when dark.
Best Wishes and Regards, John