What surgery will help with puffy upper eyelids? (Photos)

I am getting a lower blepharoplasty early next year to address concerns with undereye bags. As I am aging, my upper eyelids are becoming increasingly puffy and droopy. My eyes look nearly closed when I smile and my upper eyelids keep appearing bigger. Would ptosis correction, blepharoplasty, or something else altogether be best to address this?