My little boy?

If you are able try to eliminate the milk or milk/water at night when he wakes. He clearly isn't starving at his age, so it is more about him being happy. He may be mad, but he is already awake and crying, it isn't much different. Try to find a soft Mozart type music that you can leave on in the room so that he falls asleep to it and if he wakes, he knows that it is still sleeping time. The light may help too. Breaking habits aren't easy and there is nothing "text-book" about it, you just have to be patient and keep trying. The important thing is for you not to get upset by it, realize it is for the ultimate goal of getting him to sleep!