Great idea using a rivet mandrel to replace the axles PJ, as you say we all have our own methods and materials to do a similar job, a well explained tutorial and I hope your keeping well..
I thought rivet shanks are a bit hard thats why they snap off. Would it not be best to anneal them before fitting, heat up red on the tip to be rolled over.