Tap water is absolutely fine to drink in Madeira, and we often don't even bother with bottled water in restaurants and just ask for a jug or glass of tap water. I think your husband may be in for quite a big surprise when he returns to the island after 35 years - mostly changes for the better but not all.