I admire your restraint, but part of me thinks you should have done just that. Many years ago, my grandfather returned to his home country, Germany, with my grandmother. The hotel clerk said something in German to the effect, "They're rich American tourists, charge them double." My grandfather spoke back in German, saying, "It's so nice to return to one's homeland, after an absence of many years, and be treated with such courtesy."

If we all called others out on their BS, but in a non-threatening, non-hostile way, I wonder if there wouldn't be less of it? I could be wrong, but maybe it's worth a try.