Of course a massage will do it. A good thriller or film. A pleasant meal with friends. A great rock concert. Or simply clearing sleep debt. But funnily enough if you want to feel really, really good, go to the other end of the spectrum. Don't seek comfort: seek a challenge. When you accomplish it, whether it is getting up 1h early every day for a week to work on your novel or you re-establish a working relationship with your boss, you will feel brilliant. Human beings are designed for challenge.
Don't get too comfortable.