You know what I just thought of, about the water? I used to let Starr drink from my spring water, the ones with the sport top, that little spout that pulls up. He might drink from that if he's used to drinking from a bottle, or you could just use it to dribble water into his mouth.
Hugs