Hi - Happiness as living well fits in nicely with the Greek idea of 'Eudemonic happiness' - as you say, happiness is best defined as living well, which may include embracing uncomfortable experiences rather than retreating into our comfort zone!
I actually did a very in-depth post on this recently - what is happiness? which you may be interested in