if you can afford it spring
if you can afford it spring for the best headlights the manufacturer offers, I had HID with auto high beam in my last car (Subaru Legacy) but have adaptive LED headlights in my new Mazda3, and they are a huge improvement -- Adaptive means they swivel into curves, really neat, very effective, and in my car the auto high beam function is equally awesome.
As for aftermarket bulbs in reflector style halogen headlamps please don't do that. with projector styles they are equally not designed for HID or LED inserts, but at least the glare is not as bad.