Headlight switch replacement?

Anyone replaced one in a '96?

 

I recently removed the steering column shroud off my 95.5 to install an int wiper switch. It worked out fine, but the headlight switch doesn't match the new wiper arm. I bought a light switch off the same salvaged vehichle that matches the wiper arm. My next project is to install that light arm. It looks a little trickyer than the wiper. The wiper had two screws that are attached from the back of the mount and I used a 1 1/2" shorty phillips. The light arm has screws from the front and the steering wheel is in the way and not much room. I'd hate to have to remove the wheel & air bag and winder just to make the switches match. There is a little cup mount and ball bearing that is involved. Maybe one of those 90 degree screwdrivers might work. I could use some tips as well.
Vipe

 

Good luck, bro. Mine turned out to be two burned-out headlights. Seems odd since they were both good just a couple days before.