You got it...
Drill out the rivet, pull out the baffle and plug in the new one. It fit like it was made for it (it was!) You might need to pull the entire tail and use a broom stick to pound out the baffle. 5 minute job and you are right, I used a nut and bolt to re-attach. Makes it easier if I want to pull it for track days or just to annoy my neighbors, Tee hee...
Oh, I forgot, no rapping... I like old school rock.