I won’t hijack your thread with the details of my own mashugana (though could be an insightful general thread topic), but I ultimately had to end a vaguely similar relationship with a masseur. We did manage (to my surprise) to remain social friends until he left NYC but I had to cease all services... massage and otherwise. The transactional nature just got too weird for me.
My advice... either transform the situation to your comfort level, emotional and physical, or end it.