"Я хочу [выпить] воду" is completely correct.