Update for posterity:
Two years, two trips to the dunes and lots of hard riding, and the fix has worked.
It will suck to take apart but in the future I will be using Loctite on the shaft, key, and gear to help retain it better.
The extra hold I believe is helping the key not to become sheared off.