Mason went through a similar stage of being upset when waking up. I eventually got prepared!!! I would deliberalty be doing something really great when he woke up screamimng. I'd take him out of his cot, and, knowing cuddles will not work, put him ( for example)on the kitchen floor while mixing a cake, oohhing and aahhing the whole time, and tasting batter. He soon learnt to come join in and have fun, not sit and cry!!! After shooting the hoops, maybe this sort of distraction would work for you. having something ready to go thats inticing just may start to work!!!