I agree with the 6:30 pm bedtime, Becky, because really that was 7:30 pm only a week ago. I know most people will say it only takes a week or so for our bodies to change over, but really that's not been the case for C at all in her short little life, because she's pretty touchy when it comes to sleep. And yes, even if he wakes at 5:30 am, that's more sleep and a better chance at a longer nap, I think.
I also agree with Clare on the short afternoon A. Just a couple weeks ago, when I redid WIWO and C never fell asleep, I took her for an hour drive from 2-3 pm and put her to bed at 6:30 pm. It was probably one of the longest mornings she's ever had, but she slept 12 hrs that night. She went to bed just a tad more rested because it was so close to her nap, that she slept through and woke happy the next morning (a VERY rare event)!
Just more food for thought!!