Good Day,
I was having the same issue , did a little research on Youtube and came across C&S Corvettes out of Florida who address this specific issue. The link below is the full step by step removal and replacement of the affected switches if you want the proper fix.