Recent Upgrade to a Samsung
A few months ago, I upgraded to a nice shiny new Samsung phone.
It was not an S6 or even an Edge. Those were complete fails before they are powered up.
It was not the software that informed my choice. It was the hardware. Samsung just dropped external storage and removable batteries from their new offering. I therefore dropped those.
I got a nice new Note4. Possibly not the very latest thing and certainly not the iShiniest one around either. Hardware wise, it is close enough to the S6. Like most Samsung offerings, it is a bit thin for comfortable use but the case cures that anyway.
Samsung software is not a selling point - far from it. It is a negative point. A few years ago, I had an S2 and learned that you need to avoid opening some of their offerings at all. It was an interesting learning experience that involved a couple of resets. It seems better now and there are no "hubs" to duplicate all of the functionality. I managed to avoid the Sammy calendar long enough to install the proper one and make it the default.
I now have a very functional device. It runs Android well and the "S-Pen" seems interesting. I can put in additional storage when I need it and can even get an even hight capacity battery. It does not have pretty round corners like the S6 but it has a much better battery.
The N4 camera software is probably non-standard but seems simple enough and the pictures still end up on my Google account.