And indeed you were correct! A push of a times to around two hours has given a much improved morning nap, and gradually improving afternoon and early evening nap. Suspect early evening nap may always be stuck at a catnap until it goes completely, but morning nap is pretty constantly an hour and a half with a small resettle t the forty five, and the early afternoon is similar, but with a bit more of a fight to resettle. Yay! (touches wood madly!)