The only thing I would add to this (other than to agree it sure 'is' a pain ....... and totally asinine!!) is that once you remove the headlamp ring by loosening the bottom screw and swinging the ring up and away from the bottom, and then lifting it up off the upper tab ....... is to remove the headlamp assembly by taking out the black screws that are located around the periphery of the nacell (that go into the rubber mounts).
Don't loosen the other silver screws, as that will mess up your headlight alignment.
Also ..... when you re-tighten the nut for the front spear, just snug it up. If you tighten it as much as it's size appears to allow, it will most likely break off the stud and then you will need to buy a new spear or get fancy with JB Weld ......... and as the squirrel said .... "that trick never works!!" .....