Excellent ideas here. I have one suggestion to add to the mix. Since you are filing a groove in the shaft instead of using the push-on retainers, a snap ring might work well. This would eliminate the need to disassemble the connector and make the whole repair much quicker.
My drivers side just...