Well funnily enough so far today He W/U at 7.10, nap at 10 for 1.5 hrs, we are now trying to push through to 2.30 for the next nap, so hopefully we can get on that schedule, it looks good. His wake times have been throwing us off a lot so I think I'm just going to have to get up at 7 ish every day and wake him.
His pm nap yesterday, he woke by himself (though my other LO was making a bit of noise, so may have been that) and he was crying when he woke.