Hi Sam,
My HV (they are all bloomin different mind) said give them milk during the night til 6 months then do the water trick. Noah still might be getting a bit hungry after 6 hours, so maybe give him it for another couple of months then crack the whip
Once he is on solids he will be more full and will probably sleep longer!
Good luck whatever you do xxx
PS I cant really give advice as my daughter is 2 next week and still wakes up during the night thirsty

Its hell!xx