Oh, Kate - I don't know the answer...but no doubt we are headed this way. We have nights where Zara goes to bed at about 8:30 due to a late catnap. But she is still young, later those late catnaps will cause even more trouble than they do now.
And we also hit a very rough patch around the 5pm mark where she wants a nap ...today was one of those days. So DH has just put her in the bike trailer and gone for a ride (her first one, can't wait to hear how it goes LOL).
Zara always picks up after a bath, so often I will have her bath early to pick her up to help her make it to bedtime.
Zara is also on a fixed 6:30 wakeup. Can't move it. Her bedtime is the same as L's. She also averages about 12.5 hrs per day.
I think you did the right thing for this day (unless he treats it as a nap!). If he does have a super early waking due to not lasting 13+ hours, at least you could fit two naps into his day without too late a bedtime tomorrow......
I will be watching this thread with interest.