I have really long curly hair and this is always a problem for me.
Now that I wear a helmet, I put it in a ponytail or braid, then either doing leave-in conditioner or actually washing the hair if there is a shower on board and combing it out on the swimstep has been my solution.