I completely understand this scenario, and will be interested to see the suggestions.
Would you say that you want the massage to appear to be legit, the masseuse plays along with the genuine massage, and it's the thrill of it becoming something else that's the draw?
You don't want her to break the spell by saying "ok, you want happy ending or what?"