^ wow really long post lol. at first i was like, this doesn't sound like a facelifted coupe because you can't put angels without taking out the headlight, then i looked at your ride status and it all came to me lol.
anyways, in my DIY, it tells you what to do if you have headlight washers (in bold). but it would be essentially what you did with the lense. you pull it out with one hand and try to pull the rest of the headlight out with the other hand. if you have a friend, that would be better so you can divide up the work.