I finally relented and got a new set of AirPods (2nd gen, sealed, new, for $80)
I simply couldn't handle the abysmal battery life anymore on my original 2016 AP1's
They will now live in my gym bag as they do still have enough life for most gym stuff (for now).
The normal battery life has been wonderful to have again, but the real star of the show is the H1 chip in there and how fast it connects and switches devices, etc. Very pleasurable upgrade.
I really hope they don't mess too much with the OGAP's over time.
I love the shape, fit, open (let outside sound in) design, etc.