Be kind to yourself. A weakness for baked goods is a significant upgrade from those other vices. If the baked goods have helped you at all from abstaining from them, it's a small price

I made a kind of deal with myself that if I wanted baked goods and sweets I had to make them myself. Since then I've learned to make brownies, cookies, ice cream, sorbet, chocolate ganache tarts, pancakes, and more. It's fun, allows you to be creative, and the extra work of having to make if yourself keeps you in check.