So-what did he think of his new bed?? :)
My kids wake at night they are about the same age. I started telling them what time it was and telling them we don't get up until 6, right now it is 4 that means back to bed. I just walk them to the potty, then tuck then in, and tell them good night. No water, no toys, no prayers again ect. Although my kids usually wake up and think it is time to be up and watch a movie or something.
It sounds like you usually have a great sleeper, maybe he will grow out of it. Good luck!