I guess we all have the choice. Better water resistance and more difficult screen repair, or no water resistance and easier screen repair. How does one expect water resistance without the thing being sealed?
To Samsung’s credit, the batteries seem robust. After all, Samsung is a top quality lithium ion battery manufacturer. I bought the S6 when they first came out, and my Son has it now. It still works perfect and the battery is still in very good shape after 4 years of heavy usage. Can’t say the same for my Wife & Daughter’s iPhone 6.