One suggestion is every few nights decrease the amount you give him in a bottle by x amount and hopefully he will then take that extra in the day and stop waking at night if he is only getting a small amount.
Maybe start doing it for the 3am wake-up first and see if you can cut that out then try the 10:30 one.