Change the way of thinking health/happiness

This one bugs me from time to time as well, but then I just move along and forget about it.
Not this time though. I gave it a thought and it occured what's not really kosher to me.

So we eat food to replenish health, but at the same time we go to hospital to treat wounds.
We drink alcohol to replenish happiness.

I think the whole approach is wrong

Since the alcohol is bad for the intelligence stat anyways, first introduce water as an alternative.
Secondly change the naming, so you have

Hunger
Thirst
Health
Happiness

Hunger obviously can be replenished with food. automtically getting higher as time goes. also certain activities could raise it more, like you are fighting for example.

Thirst with water (alcohol would remove some cause it makes you dry out). automatically getting higher as time goes.. again some activities could modify it.

Health would be there instead of wounds, so now it is permanently displayed in your profile card, and when you get wounds on the battlefield it would be removed from this pool.

Happiness you could replenish by a lot of things, for example alcohol which would give the highest boost, but would also have detrimental effects like raising you thirst, and removing some intelligence), but reading a book could also give you some happiness etc.
automatically changing as you do certain activities, some lowering some raising it.