My hair is a bit longer than yours and is very thick though straight. I dive almost every weekend locally in fresh water and as often as I can in salt water. What works for me is 1) don't dive with freshly clean hair. It is drier and tends to tangle worse. 2) I pull it back in a tight pony tail at my neck with a hair tie (not a rubber band). Then I braid it tightly and secure the end with another hair tie. Lastly I fold the braid in half and secure with a 3rd hair tie. This secures all the long parts. Not much to do about the short pieces. 3) After diving I undo the first 2 hair ties and just separate the braid. Let it air dry for an hour or so since when my hair is wet it's really hard to brush out. Then I take a pick like they use for perms and pick through it. Once the ponytail is combed out I'll take down the pony tail and pick out the rest and rinse well if diving the next day otherwise I'll go ahead and wash it. If I dive 3 days in a row then I go ahead and wash it but condition it extra heavy. The leave in conditioners work but I have a really hard time getting distributed completely through my hair when it's dry. Hope that gives you some other options.