Good progress. Reminds me of when I was ur age with my first 325e. Good luck.
I gotta ask though....what the hell did you do to your headlights? If you want the smoked hella look, just grab a set. They are not that expensive anymore.
Or since you seem to like to do it yourself, then simply pop them in the oven to remove the glass lenses. There are several write ups on how to do it. Plus I'm sure there's a guy on r3v that posted the templates he used for the cross hairs that go in the high beam. I would post the links but I am on my iPhone and don't have any of those links saved here. A quick search should bring something up.
Ps be carefully and patient. Zimmie (mike) cut his hand when he was helping me swap lenses.