There is a FI that I stay in on business fairly regularly. When I pack to go there I include both a ceramic mug and a glass glass in my bag. I dislike drinking out of the <whatever they are made of> coffee cups they offer, and the plastic glasses in the room (for other beverages; water, scotch, whatever). It's not a big deal, just one of the little things in life that make each day just a tad more civilized.

So I understand the OP's pain. Glad to hear the GM got things straightened out, and that your trip improved.