This does indeed get better every generation.

I suppose the 16 hit the point of diminishing returns, for me. It lasts all day, even when busy on vacation or something, though I acknowledge that’s entirely dependent on one’s usage.