You're right to put happiness in terms of needs, instead of wants. There is this psychological system called Nonviolent Communication (NVC) that relies exactly on making this distinction between needs and wants. They have identified a list (an inventory of basic human needs). https://www.cnvc.org/Training/needs-inventory