It looks like he may be ready for more A time. I would push the morning A to 2h30 (keep the last 15 minutes or so low key) and if you get a good nap, push the next A time a bit too. If you get a nap that ends at 4 or later, I would do BT 3 hours from wake up and skip the CN. How does that sound?
I am thinking you'd be aiming for something like:
WU: 8
S: 10:30-12
S: 2:30-4
BT: 7/7:30 (eventually 8 when he gets used to the longer A time) He may often still need a short CN.