Battery drain on FP6

Check with Settings > Battery > Battery usage > view by system. Now compare with View by apps. Do these figures look representative of your use?

Here is an image of my view by system for a random recent period. If any system components or apps seem to consume an unnaturally high proportion, I suggest clear the cache of this app.

Update and the SIM change could have left unhelpful residue in cache.

The app CacheCleaner can help automate the process com.github.bmx666.appcachecleaner but requires a bit of reading to start.