His EAS looks pretty good - you could try pushing by about 15m keeping the nap at 2h if you think he needs that but I don't think there's that much more you can do with his routine.
My only other thoughts are developmental or it's become habitual? In the case of the former we just had to ride it out and EBT to keep OT at bay andbonnthe case of the latter you could try w2s
What do you think?
Hena