I can sympathize, Bruce.
I've now had all 3 iterations. The good news is that if you get brave enough to open your headlights someday, 95% of the work is done.
You could just swap in the new units and sell the old ones as they are still in high demand. The sale of the old units can darn near pay for the new ones.
I realize that most people don't want to risk damaging their headlights (which is why I'm so busy
), but at least it's an option.