It's a bummer that you have such problem. Have you tested to fill the charge port with mineral oil for a dive? It doesn't conduct electricity and doesn't compress under pressure so it might help (altought this might be messy to clean up between dives. i personally haven't tried such thing, so...