Ha, I know that feeling. My wife has been trying to get me to sell mine since before my daughter was born. I'm still holding out
If you want , BavToys sells Depo ZKW and Hella glass replacement headlights. Their identical to the ones that are OEM in Europe. They start at $179-200. Beats polishing the plastic, but get the film protector to avoid chops and stuff. A guy in our local club has a set and they look really good.
I'd get that clunk looked at. It could be a rear shock mount as they wear out over time. If the bushings fail you risk snapping your shock, or worse yet, blowing out the shock tower.