jay i imagine the problem with his headlight is not so much swirls or scartches but rather he is having a typical problem with our headlights and that the protective film or whatever they used on them is peeling away. It looks like **** and as far as i know no wax fixes it. basically I think you would have to strip the film off somehow then reapply or just get new lights off ebay
I redid my headlights in the summer. One turned out amazing, the other one was okay. I might redo the other one soon, or just wait until the Spring. I sanded them down with fine gritty and polished them with that plasticX stuff I got from Canadian Tire. The mediocre one fogs up as well, pissed me off.