I used to have Samsung devices, but the quality just got worse and worse... currently quite happy with my LG V20 but it's on its last legs, and when I replace i

I used to have Samsung devices, but the quality just got worse and worse... currently quite happy with my LG V20 but it's on its last legs, and when I replace it I want something with a replaceable battery which is quite a rarity on higher-end phones these days. Am aware of the Librem5, but I still want to be inside the Android and google play ecosystem.