Struggles with a Joy-Focused Church: The Plan of Salvation vs. The Plan of Happiness

I wondered a long time ago if people who have some sort of disorder (like depression of any kind, bi-polar disorder, social anxiety, etc.) are more prone to difficulty in a church that teaches, "Men are that they might have joy," and is such a social, "life-style" religion. I have come to believe that they do, and, to paraphrase Jesus, those who do NOT face those sort of things probably are the "whole" who need not a physician - and who struggle to be a physician in practical terms. 

As an additional note, this is another reason I don't want people who struggle in some way because they are different to leave the Church. Many of them are the very people who could serve the sick who need a physician - and educate the whole about minimizing their contributions to worsening the sickness of others.

In that light, I have noticed a movement over the last few years to replace "The Plan of Salvation" with "The Plan of Happiness".  I understand and appreciate the reasoning behind that new focus, but I also understand that such a change constitutes a two-edged sword.  For those who are inclined to be able to feel happiness more readily than others - or those for whom the concept of a salvation doesn't resonate all that deeply, due to the relative goodness of their lives - the idea of God granting them happiness if they pursue it can be a powerful motivation and an empowering goal.  For those who are prone to depression, lack of self-esteem, feelings of inadequacy, tendencies toward feeling overwhelmed, destructive perfectionism, etc., however, happiness can seem elusive (and, in too many cases, even guilt-inducing and burdensome) - while the concept of being saved from grief, pain, sorrow, struggle, etc. can be powerful and empowering. 

I like each phrasing, in a proper setting and with proper application, so I prefer the use of both descriptions rather than exclusive reliance on either one.  I think there is even greater power and empowerment in combining the two and emphasizing both when talking publicly, and I believe doing so can help those who naturally would gravitate to one over the other appreciate and gain strength occasionally from the one that does not resonate most naturally for them.