Why not buff them nice and shiny and clean and then apply a film over them to protect them from rock chips and UV?
Porsche Boxster (1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004) Headlight Covers
I used this brand on my wife's new ES350 and it's done a great job of protecting the headlamps, you can hardly see its been applied to the headlamps, and after 2 years in the sun it has not clouded or yellowed. Of course, I keep it waxed, but nevertheless... good protection for cheap money.