What time is he going to bed? If its early, that may be why he wakes at 6.
I agree with the others about a sippy of water, and maybe a toddler bed. I don't know what a p&p feels like, but a toddler bed is probably softer and takes up just a little bit more room. Transition to that, then his own room.
Mom to a girl - 6, a boy - 4, and Baby - 2