Your theory about the baffles coming loose is very likely at this age. If you do a search here and on club202.com you can read about peoples' experience with third party mufflers. Some of them sound too wanna-be/fart pipe for my taste but that is a personal preference thing. Many people put up youtube videos that help you get a feel for the sound of the new mufflers.