How does he handle OT? I would stick to the 7pm bedtime, but that is JMO. That is what we did with DS2, bedtime never earlier than 7 and usually 7:30 even during the 2-1. Our day now is pretty much what you are aiming for. DS2 handled OT really well though, so we just worked through it.