Same here. The last update bringing those features after the phone being gimped for several month made it feel a bit like a new phone again. I'm a chronic phone switcher and this is now the longest I've kept a phone like ever as I usually switch every 2-4 months at most. The battery optimisations and the fact I need to lock Garmin Connect app so it stays running in the app switcher at all times so my Garmin watch stays connected is my biggest frustration but I'm even used to that now. I'm struggling to justify a real need to change phone anytime soon. Battery is awesome, speakers are great, screen is great and it does most things really well. I thought I'd go for the Pixel 3 XL next til I saw the notch or wait for the S10 Plus but I'm actually still thinking of just getting a P20 Pro or Mate 20 Pro next year.
Like you, I'm a chronic phone switcher.
I keep looking at the P20 Pro but suspect I'd be a bit regretful as I'm not sure the difference is so huge.
Normally, every year, I get tempted by the new iPhones. But I think, after seeing what they're offering now, I just cannot see any attraction at all.
So it's hold onto this or Mate 20 Pro. Whatever happens, it's great that Huawei has broken apart the Apple Samsung duopoly; I never thought when I bought this phone that I'd be eagerly anticipating the next model; there will have to be something game changing to make me move from Huawei in the next year or so.