IMO I think a sippy cup is a good habit so they know it's there if they want. Sounds like your LO is doing a fine job of 'demanding' if he has you up at 12 am I remember those days