Just a thought, if you have plenty of access to the rivets, might be worth trying one of these:
https://www.sealey.co.uk/product/5637706740/riveter-adaptor-drill-powered
I bought one as have a bit of arthritis in my hands and can't use the plier type for long.
Was a bit sceptical, to be...