Since you are talking about bolt replacement for the rivets, here is a pic of my replacement. I used 6 bolts out of 10 holes, I would think that would be enough. You could also throw a couple of rivets in for good measure if you don't trust it, but mine has held. The locknut are the metal kind so there is no plastic to melt when you weld to the bracket. The bolt has the flange on the head so less likely to pull through the thin aluminum tunnel.
Regarding the donut clamps, when I was putting the clamps in place over the new donuts I found that the two clamps where the donuts had disintegrated, were very close to bottoming out, where the two that were in good shape had about a 1/4 inch space when squeezed together with two fingers(pic). So I ground off enough on the stoppers of those two, that they all four had the 1/4 inch before tightening.
View attachment 138118View attachment 138119View attachment 138120
I also substituted the same bolts that are used to hold the Y pipe to the muffler, for those dreaded Allen bolts.