Thank you for the advice.
So we aren't doing very well with naps again...gah! Both yesterday and today he did just over an hour in the morning, taking us to 10.45am, and then a 40 minute nap in the afternoon which was finished by 15.00.
I've tried to push his awake time for his first nap but after 2.5hours, he is visibly tired. The second nap is where I'm struggling as he doesn't seem to show any tired signs, until I get him in his room & shut the blinds, and he then shows tired signs, cries, but settles very easily.
We tried to move his bedtime forward both nights but he still doesn't actually fall asleep until 18.45, and he's then really restless and let's out a small cry every now & then, but settles himself. It just seems like he doesn't have peaceful sleep until much later in the evening.
Last night he woke up once around 2am as he'd rolled over and couldn't get back, but sleep till just before 7am.
I don't really know what to do about the second nap. We've tried varying awake times, and when we did get a good nap, I tried the same awake time the next day and got a 30 minute nap. The lack of tired signs makes it so hard too, as by the point that he does yawn (this can be 3.5hrs plus), he's then over tired.