Hello Ivy,
A couple of thoughts strike me after reading your post:
- I would try and put your DS to bed progressively earlier. I am trying to do the same with my son at the moment because when we did sleep through the night in summer he went down pretty much every day at 8 pm and woke up at 7 am. Ignoring development milestones, teething, etc., I am starting to believe that our current bed time of 8.30 - 9 pm doesn't help with night wakings
- When he's fussing and clearly not in need of you I would leave him to it because I would think that it is his way of resettling himself back to sleep and if you do step in you may actually be waking him up fully. Of course, if he clearly cries out for you, he needs you
I think you're doing OK otherwise, the naps are good, Aidan can soothe himself and you are not doing accidental parenting. Sorry I can't be more helpful, we're still struggling with the same issue over here !