Well, I switched to all braided hair to avoid having to comb it out after diving. I wash only with conditioner immediately after diving, and also use only a cloth mask strap. You are doing everything right. The only other suggestion, is if you love diving as much as I do, then maybe cut it short or shorter.
The sea is nasty to hair and tangled hair after a dive is inevitable!