C.S.
Does he still sleep in a crib? If so, try putting his mattress on the floor and letting him sleep like a big boy, so when he wakes up he can play with his toys. Could be he just doesn't like feeling trapped. I have two boys (3 1/2 and 2) and put the second on the floor around 1 1/2 and he would wake up and just play with his toys for a while (I had a door knob thing so he couldn't open it, but used a baby monitor so I could hear him). My first son always (still) wants a big milk the minute he wakes up and that seems to put him in a good mood - but if he doesn't it then there will be a major melt down. If you decide to let him cry I'd go in there every few minutes letting him know that as soon as he decides to be a happy boy he can get up, but if he wants to cry he needs to stay in bed. Good luck, hope you get things more settled feeling before baby #3 arrives!