Help us fix baby’s EMW!

Our 6 month old has been having EMW for two weeks now. He is on 2 naps, wake windows average 3/3.25/4-4.5. He averages anywhere from 10.25-10.5 hours awake during the day, and his naps average 2.75-3 hours. We don’t really ever have to cap his naps.

Bedtime we still go by his last wake window but we have a DWT of 6am every day. He’s been waking up anywhere from 5 to 5:15 and either stays awake in his crib rolling around, or falls back asleep for like 15 min right before I need to get him up at 6.

Does our schedule need tweaking anywhere? He dropped to 2 naps a week ago but still had the EMW the week before he dropped.