Will he take more than 6oz in the afternoon? If he will take 8oz like he does at bedtime I would offer that, then the 2 8oz bottles plus a breastfeed and you know he has had enough milk during the day. It looks like he is eating well, I would just offer water when he wakes at night and resettle - I doubt he is waking from hunger really!
Laura