I've now optised all apps, set dark mode and will keep an eye out for updates. Nice phone. Better than Apple IMHO. This is a works phone, so not an option to return.
The screen and camera more than makes up for any battery performance issues. I'll knock up an 18650 fast charger for it. Some interesting projects I plan to do over the winter break with solar rapid chargers for mobiles.
I too am disappointed with the battery drain issues, there has been no resolve or even a response to this or any of the other related threads on this topic. Samsung, we are not asking for a lot here.