I have an issue with pastries too. I consume way too much of them and sweets in general so I’m working on that along with my coffee consumption. I found some seasonal teas that look nice I’m thinking of getting next week. I’ll post a pic in a second. Some of them have caffeine but less than coffee and some of them have no caffeine.