Sounds like we have similar hair and are having similar problems. I'm having the worst hair day in the full two years since I went silicone/ sulphate free, so not fair after all the effort I've put it I could actually cry.
Pretty sure my hair is over-conditioned, it's lank with no curl. Curled up beautifully with a sulphate free shampoo followed by protein treatment (Komaza Care) but now is virtually straight with no more than a few hairs glued together, looks like I brushed it out!
If I find a solution I will post it up for you.