J.H.
I had a similar situation with my 22 mo old. She goes to daycare off and on and seemed to sleep better and longer at daycare. I finally adjusted my day so that her (only) nap was at the same time as daycare's naptime. Now she does great! She takes one nap in the early afternoon. She too gets really cranky at times but I think it's just hitting "the terrible two's" and wanting to be more independant! I did find that more stimulation in the morning time helps with naptime more. I don't get much done in the mornings but she needs playtime...