Hi Emma,
Sorry for the delay in replying to you I have been away on holiday.
Wow, 10 months, that has gone so quickly.
Ok, looking at your first nap, I would perhaps try and increase the A time so that you can try and get a 2 hour nap. Perhaps to 3.5 hours. If you get a good nap of 1.5 - 2 hours, you can then increase the second A time to 3.75 - 4 hours and that way you can eliminate the cat nap.
Looking at your routine, he is not getting an early waking really, as he is going to bed really early. Once you are able to increase the A time, you can try and extend your day a little bit so that your DS goes to bed a little later, and hopefully will wake up a bit later.