In my opinion:
You don't need to take the headlights out. Using masking tape, you can mask all the edge of the light. If you do a good masking work, and be careful, you won't damage sorrounding paint, etc. Remeber that some cars are difficult to take headlights out.
About sanding, you didn't...