4:30AM Bottle...WWYD?

For about a month or two my son has slept 7PM to 4:30AM. Prior to that he didn't STTN & woke up 1-2 times in addition to this 4:30 timeslot. He dropped those 1-2 wakings on his own. Currently, he always wakes up at 4:30, has a bottle and then goes back down for about an hour. In the last two weeks, that hour of additional sleep is getting less and less, most days up for the day at 5AM. He is cranky and fussy and seems like he needs more sleep. We have tried letting him fuss for as much as a half hour to ensure he doesn't need more sleep (he is not freaking out and I know he isn't hungry because this is the wakeup after the 430bottle). We have weaned from BF to WCM in the last three weeks. He drains the bottle at 4:30. He is 99% for his height and weight. Eats and drinks like a champ throughout the day.

Long story short...should I try to wean him from that 4:30 bottle since it's so close to his a.m. wakeup?  Do you think at this point I am supporting a habit or do you still practice the "he must need it if he's waking up for it and he'll drop it when he's ready" rule?  I guess I am just wondering if I wean him from the bottle, maybe he would get another 30-min-1hr of uninterrupted sleep?  I feel like the bottle is getting in his way of more quality sleep?  I don't care if he's up for the day at 5AM, but it seems to me if he could sleep until 5 or 5:30, THEN have the bottle and be up he would get in a little more sleep you know?  Thoughts or anyone else been through this/have it going on?