A second free cold-water dispenser is mapped on the 2nd floor, the departures level. The page does not say whether that pin is before or after security.

PRONTO publishes crushed-strawberry milk at 605 yen including tax for the R size and 693 yen for the L size. That is a cafe drink, not a fountain refill. Vending machines are mapped near both arrivals exits and beside domestic gates 5, 8, and 10, but the airport does not print a bottle price.