Headlight switch issue

I finally got the correct switch and put it in this weekend. Works great but what a pain in the ***. I've pulled the dash apart 3 times for various reasons and removing and replacing that switch is probably the hardest thing to access on the entire car.