My main thoughts on phones is that buying them suuuucks and that phone designers tend not to have the same priorities as me, so you have my sympathies in trying to make this choice! Given your priorities in using a phone, I think you're right that it makes sense for you to go with the Samsung, despite the various reasons to be unexcited about that choice.