I've suffered numerous scrapped knuckles/cuts due to the same problem. Just keep working it and when your fingertips get numb, stop for a few minutes and then try again.
You could also just remove the headlight as you stated, I did that once too.
I've also noticed that sometimes the connector comes out fine, and other times its a real pain to free it up...
good luck..
