Hi Danielle, have you tried wake-to-sleep? I suggest this right away because I am currently using it on my LO for a habitual wake up as well. Your early wake could very well be a routine issue of some sort or even something else but my first thought would be to try wake-to-sleep. I've been playing around with it for the past few nights with my LO and have found that when I stir him 45 mins before his usual waking time, he will sleep straight through it. The timing may be different with your LO. You might have to try 30, 45, or even 60 mins.
Also, could you post your routine in EAS format? There are some wonderfully wise women on this board who will probably be able to spot something right away. You've come to the right place for fabulous help.