I have an 04 JCW. I had to get one of my headlamps replaced on my insurance. It's OEM headlamp, but now I'm able to tell the age of my other one. I've tried all the different buffing techniques and "wonder" products to no avail. At this point I'm considering a swap to something else all together. Anyone have any advice on something that looks good on the JCW?

(mine is chili red, dark tent windows, with 04 standard JCW trimmings)