You are correct! Water not only forms very strong hydrogen bonds (although not as strong as the hydrogen bond formed by HF), it creates a continuous network of hydrogen bonds since there are equal numbers of electropositive hydrogen atoms and non-bonding electron pairs (not possible in HF which has only one hydrogen atom per molecule and 3 pairs of non-bonding electrons).