A bump with an Update! Thanks to the OP and this thread for saving me some $$$!! I managed to rebuild my joint for under $8.00. In fact, had I know I could have bought the bushings I used at Lows I could have done this fix for under $3.00. I managed to keep it on the Cheap with a tweak to the OPs fix.
My whole rebuild is documented here
But, the short short version is this.
Ground and punched out the rivet. Drilled and Tapped a hole in the end, and used a bolt to secure it. Thus, re-using the Rivet!!