Here is what I worked through to get mine straightened out.

I first drilled a hole through the side and added a fancy cotter pin. This tended to bind and eventually bent and destroyed the pin.



Next I drilled the hole a little bigger and used a heavy duty pin and bent it back to secure it. This has held up well for the last 9 months. I do like the tap idea.
I used a panel popper and washer with cotter inserted to pull up the pin since it tended to drop down when I drilled it.