I hate these kind of posts normally but this upgrade is different to me . Simply because im one of those types of people who likes to progress from phone to phone of the same brand. I went from Galaxy s1 to s5 and then swapped to Note when i needed a larger screen. But oh no the Note 7 was a disaster and now no longer an options. What do I do now? My OCD on this matter is having a panic attack. The closest i can find is the XL Pixel. Would this be an obvious choice for you?