I agree that this kit will do the job. I had something similar but mine was a cheap Chinese kit. Here is my work with my headlights:
My headlight work

The last picture in that set show before I put on the final polish. Here is a better picture. Remember I had to strip the paint off of my headlights.