have you try to tell him to 'wait'? i think bb now understand more.. you can try to train him to 'wait' (not only to wait for you to 沖奶... but like wait on other things, too)...
enoch also called '奶奶' every morning ... usually I will tell him 'mammy is going to get 奶奶, you wait here... 好ng 好?" usually he will say '好.' then will wait for me lor.
In stead of you full speed to adjust him... you should now make him to adjust your schedule a bit ...