L.H.
try changing the nap time to two hours after you think it should be- obviously the time you're going for is not working...or try earlier...just try different times...a 'rule' I learned is not to let a baby cry any longer than his weight- meaning if he's 25lbs then he should cry no longer than 25minutes...