You could try and increase A time just a little bit, by 5 or 10 minutes and see if that makes any difference.
I know it's very very difficult, but I suggest you don't go in there until he is "calling" you, even if in your eyes it takes him so long to go back to sleep. You can actually create a prop like that and he will relay on you to go back to sleep.