It does sound like it might be hard water buildup to me. You might need an actual chelating shampoo to really knock it out, and use the lemon juice more as a preventative. I was having terribly tangly, determinedly dry hair that wasn't responding properly to anything, and chelating knocked it instantly back into shape.
Bookmarks