After figuring this all out for the umpteenth time, I think Stan is a bit higher in sleep needs than many. So we have basically two routines now, a nursery routine and a home routine.
At home we do:
6.30-7 awake
12.30-2.30 nap
7.30 bed
On nursery days, the nap will be +/-1hr, and bedtime will be at 7. Friday/Saturday mornings tend to be creeping towards EWs as OT sets in, but a long nap on Saturday seems to set us right again. Touch wood.