I wonder if there will be a trend to do away with the gender-specific masseur/masseuse terms, just as there was a while ago to get rid of waiter/waitress? Massage does seem like an area where the gender of the person would matter more, as opposed to the gender of the person bringing your food. Those who patronize Hooters may disagree.
Speaking of which, I stopped into a new "Twin Peaks" restaurant. I went in & sat at the bar, thinking moody, dark, like the TV show - nope, the "Twin Peaks" referred to something else. I made my apologies and left.