it sounds as though you just need to tweak lo's routine a little!
you may want to start extending A times slowly 15 min or so at a time and keep xtra A time very low key so lo doesn't get overtired or overstimulated in that time before sleep.
you really only need to feed your lo 4 times during the day at this point - say 6-10-2-6 if you can go a little longer or need to go a bit shorter than do it but you def don't need a fifth feeding at this point .. unless it is a night feeding.
if lo is waking at 6 am i would put lo to bed at 6am b/c the routine should be based on a twelve hr day kwim?
the early waking in every way signifies to me that lo is getting too much sleep and you probably need to cut out that catnap at the moment...you could try cutting it down in time but i think it would be easier just to be rid of it and you may possibly have to put lo to bed even a bit earlier than what i had suggested for lo to be able to make it through and not get overtired...but with extending A times it should push the day up some and make it a bit more realistic.
the second nap may be a struggle if lo isn't tired enough to stay asleep...try extending all the A time slightly and slowly and see if this improves any.
hth! let us know how things are progressing