A masochist without the sexual baggage

The word masochist is used for someone who enjoys what others consider unpleasant:

1.1 (In general use) a person who enjoys an activity that appears to be painful or tedious:

It also has song sexual connotations:

1.0 A person who derives sexual gratification from their own pain or humiliation:

Is there a word that describes this condition without the sexual baggage?

_{Citations from ODO}

Solution 1:

I believe that you have overestimated the problem. "Masochism" was indeed coined to describe sexual gratification through pain, specifically in the case of Leopold von Sacher-Masoch.

However, the word has gained such wide currency without the sexual baggage that unless you specify the sexual version, it is unlikely you will offend anyone's sense of propriety.

For instance the n-gram of "masochism" vs "sexual masochism"https://books.google.com/ngrams/graph?content=masochism%2C+sexual+masochism&year_start=1800&year_end=2000&corpus=15&smoothing=3&share=&direct_url=t1%3B%2Cmasochism%3B%2Cc0%3B.t1%3B%2Csexual%20masochism%3B%2Cc0

shows the comparative usage pretty well.

Solution 2:

Some might call them a glutton for punishment

Someone who habitually takes on burdensome or unpleasant tasks or unreasonable amounts of work. For example, Rose agreed to organize the church fair for the third year in a row-she's a glutton for punishment . This expression originated as a glutton for work in the late 1800s, punishment being substituted about a century later. ¹

_{^{1The American Heritage Dictionary of Idioms by Christine Ammer. S.v. "glutton for punishment." Retrieved July 20 2015 from http://idioms.thefreedictionary.com/glutton+for+punishment}}