Thanks Alan - that's a variation I hadn't thought of, well done and nice job!
In my restuffing I used stainless steel rivets, not aluminium which forms an electrically resistant oxide surface in electrical connections.
As I mentioned in a previous Post
" ... I'm not putting forward the methods I used as 'best practice' in any way! I'm simply describing the approach I took to the challenges of restuffing a dual electrolytic can capacitor." The more options we have then so much the better!