I'm in the exact same boat you are in, I bought mine about 3 months ago (same exact one as you) and I'm looking for the same kit. In all my research the kit with the baffles/plates is the correct ones. I've been searching and still searching and there isn't one available in the this world. lol...