Almost the same as what I did, 11->16 Pro, and really only because I wanted a nicer camera. 128Gb has been more than enough for what I need. Don't have a reason to upgrade, battery still gets me through 2 days without a charge, and with Kino the times I want to have nicer-than-stock video I can get it.
I've been in a similar situation for almost a decade now. There's an elderly woman who's email address is one character away on the keyboard from my own, and I often get emails meant for her. I tried for years to respond to inform them that they are using the incorrect email address, to no avail. At this point I've started to go in and disable/cancel anything that is signed up for with my email address and have to aggressively filter spam.