Presently, I'd take any improvement but I sincerely believe happiness and peace of mind are more (or can be more) than just freedom and relief from those things.
Nah, happiness is an 'active' emotion, in contrast to boredom. It is a deviation from the default state of mind. The reason may not be realized, but there is one.
Why would you consider being unhappy to be suffering? As for you question, I would answer yes. However, I could take it to the extreme and say being dead would be eternal happiness.