A.M.
all the changes are throwing him off, but if he wakes up crying, he is probaly still tired. i agree with the other poster that his sleep history is not the average of other children, so dont expect perfection. im a bit confused why you said you have him go to bed later while he has less naps?
anyway, if he seems tired in the morning, let him have a nap but dont worry about the time. then after he eats have him take another. the adjustment would be him not tired in the morning, eating lunch, then sleeping 2hours in the afternoon. its very hard though as babies change so much day to day. he may be more or less tired each day depending on how active he is. just do your best and try to make up a lost time somewhere else(either nap or nighttime). does he crawl alot or walk? all those changes are quite disturbing as well and he will change all over again.