Samsung S5 was waterproof while having replaceable battery. Technology is certainly there.

But I also question your premise, I don't think it's as clear. I've never dropped my phone in a sink, but had battery issues with basically every phone. Often the battery starts failing much earlier than 80% in two years.