It could definitely be the light switch. I'd head to your local u-pull-it junk yard and pick both switches up. Besides getting the parts for cheap, you'll be able to figure out how everything comes apart without damaging the column in your Jeep.
I had the same problems with my 2008 in March. Reground the ground point G110 by stripping approximately 7 wires at the grounding point it will solved all the weird issues. It’s take about an hour to work on a confined space near the accessory belt. Good luck!!!
FYI -- got mine working again. Coincidentally, the G110, G111 and G112 were all shot. Stripped down + re-connected and all back to normal now.I’ve been ignoring this problem for years. I did the G110 My next move is to swap the TIPM with a junkyard unit and if that fixes it I’ll get a rebuilt one please post back your solution if found.