> Pride is defined by Merriam-Webster as "reasonable self-esteem" or "confidence and satisfaction in oneself".[1] Oxford defines it as "the quality of having an excessively high opinion of oneself or one's own importance."[2] This may be related to one's own abilities or achievements, positive characteristics of friends or family, or one's country. Richard Taylor defined pride as "the justified love of oneself",[3] as opposed to false pride or narcissism. Similarly, St. Augustine defined it as "the love of one's own excellence",[4] and Meher Baba called it "the specific feeling through which egoism manifests."[5]

Seems to capture "both" aspects for the word to me.