I would push bedtime back later. Bedtime is the most flexible time of the day, and his day doesn't have to be exactly 12h long. I remember you saying he's an 11h night sleeper, so, he'll probably be okay with more A time before bed.
Perhaps others will chime in with their thoughts...