I think that what will help is cutting out the before bed bottle, as it seems that he associates this with falling asleep. Or, still have the bottle but maybe earlier in the routine. He will still wake for a few nights, and I would suggest some PU/PD to help with this. There will be crying involved, but it is just because you are changing how he goes to sleep.
Hope this helps!