Heat the chocolate shake if you drink it. What about making the coffee weaker. Have weak tea, black, green and peppermint. I had the same bother aand started having warm water when i was too cold to manage cold water. This also a good habit to form for post tfr.
You could also rinse your mouth well after drinking the coffee, i'm not a coffee drinker but black tea caused the same problem.