Replaceable battery on future Android devices

My last 3 smartphone upgrades were driven by the non-removable battery degrading to 1/4 its original charge life. Two years ago I bought my Note 4 specifically because of the removable battery and micro SD slot. I added a 200Gb micro SD card and 10,000 mAh Zero Lemon aftermarket battery. Absolutely love this setup. Some will say waterproofing electronics AND replaceable battery are exclusive design goals, but my 20-year old battery-powered diving watch shows me otherwise. As much as I love my Samsung Note 4, I will switch to another manufacturer to get a removeable battery.