On E.bay baffles are sold ,getting one to fit,,well could try.
I went the other way,made one, it works fab and i can alter it to be louder or quieter.
I had the same problem as you,for one year it seemed nice,then i just started to notice it in my helmet,,,head banging noisey