Finally got the rivetted pin shaft out of the linkage arm, this was the most challenging part of the repair. Still trying to think of a good method to get the shaft part of the pin out of the linkage arm.