Regardless he s end to always wake and stir around the 30 min make
So this is pretty classic for a baby who is overtired at BT.
Trust me, it is rare for me to say this but I think you may need to wind your A times back a bit to 2hr, 2:15 at the max. The short naps of 30min you're getting are classic OT as well and I think if you keep stretching that first A time to 2.5hr, its going to be another couple of weeks before he settles into that and reliably takes long naps. I suspect winding that first A time back to 2hr/2:15, will set you up better for a long first nap and for the rest of the day to go much better with 2hr A times.