sorry to hear about the short nights guys. We are getting short nights too about 9-9.5 hours on the nap day. It really stinks, he can't cope with those very well, but he can cope with no nap much better!
We have had a rough couple of days too, lots of tanturms, whinging and crying. I have been putting him to bed at 7:15 on no nap days, we wakes at 6am, and on nap days, (1.5 hour nap) he's falling asleep by by about 8:30 - 9pm and waking at 6am. The only good thing at the moment is the long night on the no nap day.
He did about 5 out of 7 days no naps again.
BTW he's turns 2 today!!!