hello99-
I do make a ha’etz on chocolate, and on orange juice as well. Tosafos about the beer (I assume you’re talking about the bishul akum Tosafos in AZ) is not a raya because as you write about coffee, it is just flavored water. A chocolate drink, such as hot cocoa, would be the same. The truth is you seem to know the sugya a lot better than me, but I know my rav has a lengthy teshuva about it and I will try to look it over and post his key points. L’halacha however, this is what he holds.