Time for a new shiny thing. Introducing the Oppo Find X5 pro.
Had a bit of buyers remorse initially, as the camera app was incredibly bugged and kept resetting my settings, but this morning I randomly got an update and the phone settings now stick.
Seems to take a nice photo.