You could try an ACV rinse which is supposed to remove hard water deposits. Here's a thread about how to do one and why:

Also, if you gave up sulfates but are still using poducts with silicones, you need a low-poo to remove the silicones or they will just build up.