I just re-read your newest post and I just suggested pretty much what you are already trying to doing, so ignore the idiot! I think your 'ideal' routine sounds good, because we dont want Gabby demanding to watch Home and Away with you 2 years down the track! heehee.

So, I guess I am saying personally, I would wake Aidan if it was on dinner time, any meal time in fact. I remember my MCHN saying always let a sleeping baby lie, unless its food time! If I have to wake Aidan, which isn't often, I always do it very gently, by going into his room and asking him if he is hungry, then checking on him and asking him again a few minutes later... nice and easy!