Jenny, I think you did a good job thinking it through, and doing what you felt HE would be comfortable with, and appreciate. As such, you were being very nice.

My heart goes out to you, when you sweetly asked if there was anything else and he asked you to bring him water. I know that must have hurt, and that it must have taken some effort to handle it graciously.

Kudos to you lady. He's lucky to have you, whether he knows it or not.