As you have stated the addition of "water" only has not corrected the cooling sytem failure, although present with what coolant/water mix was provided, best take it to a cooling specialist like Natrad for a diagnosis eg: to pressure test etc if you are incapable of diagnosing what is in front of...