I would agree. Maybe offer water instead. I actually leave a sippy cup of water in DD's room, if she needs it she drinks it, if not I just bring it downstairs for later.
Do you have any toys in the room that he can play with so you can get a few more minutes of sleep? That can help too, he may be ready to start the day. DD used to be up everyday to play for a while, now she sleeps a little later. They toys lost their appeal, but they do give her something to do and I get a few more minutes of sleep.