New to No Poo and Struggling

I have now been 3 weeks no poo and unfortunately I have found out I live in a hard water area!

I am moving to London for uni in September andĀ water gets even worse there.
I have tried baking soda and immediately realised it caused so much breakage to my hair so I have been water only washing and occasionally using shikakai and other powders in my filtered and boiled water (which takes me ages). I really need advice because the condition of my hair does not seem to be improving and so much dirt seems to come out on my brush!

I massage my hair thoroughly each night and brush and preen etc when needed and especially before washing.

Will my hair ever adjust if I am in a hard water area? and is what’s happening due to the transition period?