ok new switch arrived. Plastic is pretty much the same shape although the click action is definitely nicer. There are more wires to it so I have to check the GM manual to find out what the others do.
Problem I face is the wires for the new harness are too short compared to the old one. They would barely make it to the opening in the steering column. Looks like I'll probably cut the end off each harness and splice the wires together with some solder and heat shrink instead of trying to pull the new wires through where the old wires went. Only leaves those extra wires as a problem since they don't plug into anything.