Dang, so this is a recent Samsung phone then? I've heard really good things about Samsung though the last one I used was the Galaxy S3 and that was my wife's phone.
What are you going to get instead? I've been pleased with the Pixel line and have delayed updates for many weeks. It will just nag me with a popup every week or so but never forces. OnePlus I've also been very pleased with and have never even gotten a nag from them.