Yup, I agree with bec with regards to naps. Also keep in mind it will take a solid week, possibly two before everything irons out. With regards to the morning WU time, it depends what time he's going to bed. If bed time is 7pm, he should be ok with you waking him at 7am, as that's a solid 12 hrs of rest. If you're putting him to bed later, I would suggest moving bed time forward a bit and gradually syncing the two up.