on a side note, don't ya just love the fine panel fit of the hood next to the headlights! I'm always thinking my bumper stops are out of whack or something, it's just hard to accept the fit is so gawdawful. Oh well.
More on topic, I can't remember which product it was but I got something at advanced or autozone which attaches to your drill and you use it like a mini-buffer. Worked pretty well with no worries thus far. And yes, my h/lamps were much worse than some of the ones pictured here. At least we have options!