Hi there. If you are consistently getting short naps, then maybe you need to push A times more until the nap lengthens out. You mention getting 2 hour plus naps. That to me sounds like a catch up nap since you are not consistently getting it. That's good so he is able to catch up on OT. If I were you, I would increase A time and cap pm nap to leave a good gap till BT -perhaps the same amount that worked for you before. Of course that depends on which nap is easier for you to get. With us it is am, so I'm doing long am, CN and short A before bed. Others do am CN, long pm and long A to bed.