Okay, was hoping someone with more insight would come along, but I'll take a stab.
My first question is with the 2 bottles before sleeps, is your LO falling asleep at the bottle or just having the bottle, then going in the crib awake? If LO is going down awake, then I don't personally think the bottle before your sleep times is at the root of your problem.
Since it sounds like your Lo is waking at the same time every morning for the bottle, have you considered trying wake to sleep?