I was just going to suggest covering the pram aswell or some background noise in the bedroom.

DD is starting to drop her afternoon nap but still has one in the morning from 10 - 11 or 12, i am starting to try and push that to a litte bit later if i can so there is less need for the afternoon nap.

Does he show any tired signs at all or is it just the grumpy crabby behavior we all love?
I know now DD has dropped that nap sometimes she gets a bit grumpy but i give her a snack or a bottle if she missed one and she seems to perk right up?

Not sure if this helps... good luck..