My LO is the same age as yours. I ditched the afternoon catnap and replaced it with a 5.30pm bedtime, she sleeps till around 5.30am feed and back to sleep until 7.30. THis happened with my other two daughters as well. 5.30pm bedtime is BLISS!