Hi, thanks for checking on me! Naps have been going great actually. Today I had to wake him from every nap after either 1.5 or 2 hours! The only downside is that all naps are in the pushchair. He self settles in it most of the time without it even moving, just parked in the dining room. So not ideal that he doesn't sleep in his room but a lot less stressful, I can usually put him down and just walk away!
The only slight issue we have now is not a nap issue, but he wakes at about 5am and is mega restless and awake on and off until 7am. So I don't get any sleep during that time.