I think you hit the nail on the head with diminishing returns. I’m usually on a 5-6 year usage period too. I can understand the battery swap helping out but my last few phones have felt so sluggish after 4+ years so I start looking at new phones around year 5. I have a Pixel 7 now and I’m going to wait until end of support and then we’ll see what the offerings are then!