This fix was a little long in the making but finally got around to it today. All and all pretty easy, only took 5 minutes and about $30.
Part #: 20940369
Got mine from Amazon: https://www.amazon.com/gp/product/B004940ZNK/
Flat head screwdriver
Video walk-through (sorry for the angles and dirty car)
Try and transcribe a bit of what happened:
There's 3 bolts on the bottom of the steering wheel column, you'll see the three indentions.
Once those are out, just pull apart the cover at the seam
On the blinker switch itself there are 2 clips at top and bottom that you'll need to take the flat head screwdriver and push apart.
The connectors at the back easily come apart as mentioned in the video. Pinch and pull the smaller of the two where appropriate then use the flat head again on the larger connector to pull it out.
Reassemble. All done!