HUGS! I don't remember if I told you, but my dd was a 30 min napper until she was 5-6 mos old. It was terribly tough b/c, like you said, she was always so grumpy and ot. Do you think it's possible for Callum to have a touch of colic?
I hope you get some much needed rest.