Brad, there is a switch "upgrade" kit for 2nd Gens that I put on last time. The kit was cheaper than just the switch, go figure. In addition to the switch there is a wire extension set so you can pull the thing out a bit further to work on it. A couple of the wires are different colors than ours, but there is a conversion chart... . somewhere. I posted a thread on this when I did it.
Bob, how's that LED upgrade working out? I was reading on an LED website that you should put the same color LED as the color of the lense. Did you do that? Does it shine bright enough for you through the lenses? I bought the rectangular replacements for my dually fenders and tailgate. They're great!