Welcome to our club.
There are no after market headlamp units per se, but some members are retrofitting the BMW 5 series units as you will see in another thread.
Have you tried polishing the galss lenses with Barkeep's Friend or Bon Ami?
You could get new ones from
http://www.infinitpartsusa.com as most used ones are chipped or scratched because most don't armor them like offered at
http://www.stongard.com .
By the way, most of us are not blind, so not "shouting" with the CAPS KEY locked is much appreciated.