Had my OP3 since launch, love it to death, would love to keep it, but the issues with it keep pilling up so i'm begrudgingly considering an upgrade in case i can't get it fixed.

Ideally i'd just want an OP3 with a better camera, as it has the perfect screen size and i mostly just listen to music, browse reddit and take pictures with my phone.

Feature wise it has to have a headphone jack and be unlocked, outside of that; decent battery, fingerprint sensor, 1080p screen is enough, >= 64GB storage. I'd really like capacitive buttons and fingerprint sensor on the front, while a good rear camera (anything on par or better than the OP3 one), good audio DAC and expandable storage would be nice to have's.

Don't really care about bezels, phone thickness, speakers, benchmark scores or such, but I am prone to dropping my phone, so good build quality would be a big plus.

And last but not least, A good android skin and/or support for rooting. Huaweii, old asus and old samsung phones are all great examples of shit i want to avoid.

I can go up to 400€ if it means a substantial upgrade from what i'd get at ~300€, but around the 300 mark would be ideal.