Except for the battery I don’t think those things have ever really been user swappable though. The issue with water protection on phones I have worked on is that its hard to maintain when removing the screen because it tends to stick. I guess you could always buy a new gasket which is probably what the Apple store does.