Yes, clean install, but also:
I don't use phone to play games,
I use phone in "energy saving" mode.
I use an application that freezes all the applications I don't use daily, so they don't stay in background.
In this way I can reach 10-12 hours SOT daily.