Z3 and z3c - replace with what?

Me and my SO have a z3 and z3c, but both are showing signs of age and need replacing. My z3 has a few odd bugs (WiFi doesn't turn back on when airplane mode is turned off, flaps and magnetic charge port getting loose). Z3c - camera has stopped working (just shows black, front camera works fine).

I can't work out what is the best model of the current few, and there doesn't seem to be a current replacement for the z3c. What would you recommend? Anything android considered, but S8 is way too pricey.