Rather than choose simply between water and whole milk, you also may want to consider skim milk. Skim offers the same protein, carbs, and calcium of whole milk, but without the extra fat.
Skim milk offers 10 calories per gram of protein, which is about ideal for weight maintenance.