Hi there.. I've been following your thread under Concerned/Confused Dad. You know what, I would keep doing what you are doing. You're totaly on the right track.. so stay with your original plan.
As for baby's cycles.. every child has their own type of cycle, so we try to work out a daily routine that best supports it. There are some commonalities among the age groups.. but you always have to allow for individual differences and lifestyles. So there's balance between guiding the baby's cycle and also respecting it.