Up his milk intake through food then. Cheeses, yogerts, and other milk products make a difference. He only needs 16oz of milk product (thats either milk itself, or milk products) His intake may go down for a few days after you take the bottle, but it will go up again once he relizes he'll only get milk from a cup.
Giving him the bottle at bedtime means he knows he's going to get a bottle, so why drink more, cups are harder to drink from, and it also leads to a prop for sleep, and really you don't want him dependent on that bedtime bottle, both because it makes sleeping harder, but also for his teeth. Drinking milk before bed leads to faster tooth decay.