My Apple Watch doesn’t eject all the water. Not even ejecting it several times. What can I do about it?

Many times I'd like to swim while wearing my Watch, I think it’s too risky. Because of three reasons. The first and main reason is that, I don’t think Water Lock enables automatically when swimming while wearing your Apple Watch. Second reason is, all the water that gets in its speaker doesn’t eject unless I disable water lock and eject it several times, which is very lazy to me. The third reason is because the battery starts running out quicker. But everytime I notice that when it happens, I need to erase my watch and Set it up again “as a new watch” without restoring it from backup because if I restore it from a backup, the battery keeps running out quickly. Is it recommended to send my Apple Watch Device to an Apple Store and ask for a replacement?