Just a thought I had when I noticed he had a bottle at nap time....is it possible he is using the bottle of milk as a sleep cue and wanting one to resettle each time he stirs at night? I'm not sure how to fix it if it is, but just an idea....