@Reid_Sommerville - Can I suggest you start a specific topic for this issue so the community can offer some support for your specific issue, it’s good to note your issue in here too 
@mgkoeln - glad it went smoothly for you (mind did too 
). I note you haven’t run the partition update and I can understand why not because it can be a pain getting everything back to how it was. Just be aware that you may have to run it as some point to continue getting support updates (it’s going to be hard for FP to constantly release 2 versions of every update).
@Mist, see this thread about the flickering screen issue, maybe worth asking on there if anyone has tried to downgrade. I’m pretty sure if you use the flash tools for MTK you can do this (method is in here and @Elchi might be able to help you and has had some experience using this method)