I think #7 should be modified to "reduce suffering" after which it will accommodate not just healthcare but any pursuit that addresses a person's mind or body.

I think #7 should be modified to "reduce suffering" after which it will accommodate not just healthcare but any pursuit that addresses a person's mind or body. That would include your examples of massage and prostitution as well as others like therapy. Friendship and romance would fall under #9 as an industry since the goal is to match people with potential friends and partners. I'm not sure the 'emotional services' that you receive from friends, family, and romantic partners should be evaluated as a commodity. To make that clearer, if I manufacture something for a loved one or purchase it while I'm travelling and then transport it back to them I don't measure the value of that action in terms of money and I'd sincerely hope they wouldn't either.