i hear you on the grumpy mood ! we had to start waking Ryan from his nap as it was affecting his bedtime . he could nap anywhere between 2/3+ hrs . he wasn't tired at 7.30pm . we would put him down but he would be awake till nearly 9pm . it was getting worse and worse , he was resisting bedtime . we had to wake him after 2hrs napping , yes he was really grumpy , we then tried to make the nap a little earlier . he goes to nap at 12.00 asleep by 12.30pm and we don't let him sleep any later than 2 pm . he soon adjusted to this and now most naps he wakes up himself , sometimes can still be grumpy if i wake him . when i first started waking him , he would look at me , then put his head down and try go back. he goes to bed at 7.30 and aslepp by 8pm . he wakes between 7.30am and 8am . i would change the nap if you have more time to yourself in the evening . you could change bedtime untill there's no nap then back to early bed