Yes, that looks correct.
Can't believe how much that costs.
But I don't remember what I paid over 20 years ago either.

Usually the main symptom of rivet failure is felt at the clutch lever and clutch slipping can be a symptom, but not as common.
Have you had the rear wheel off lately and checked out the pinion cup?
Good luck, hope you solve it.