I will be getting it bead blasted, just to make sure.

Can you tell me how to remove the baffle?

And can you tell me what size pop rivets the badge takes?