Yeah, I remember that problem.
What I did is I always offered a bottle (or maybe in your case BF) in waking. You might see that he is taking a full feed then and he might not. In case he doesn't you can try and offer a little bit more during A time.
Sorry, I don't know if I am clear enough...