I had to pull the header panel from a local salvage yard and learned a trick to removing the lights. There are mounting pegs on the back side of the lights which poke through the header panel running across the front of the car. Slide the metal clips off of these pegs and the lights will basically fall out. I think there are 3 clips for each light. Consider how/if you can get the clips back on in the limited space. I was able to mount my lights with the header panel off the car so I'm not sure about doing it in place.
Have you tried polishing your lenses with silver polish or buffing them with rubbing compound? This can help quite a bit in some cases.
