I've just gone back through my old posts and found this from when Jack was 10 months. He'd just dropped to one nap really, with a first A of about 5 hours and a second A of whatever it took to get him to a 7pm BT (if this was too long I'd do a short catnap to see him through). Here's a sample 2 nap day for you though:
WU: 5.30
A: 4hrs 30
S: 1.5 hrs capped (or let him sleep til 11.30 at the latest)
A: 3hrs 20 is the shortest A I've managed here. This is the A time he's most likely to shorten. I've normally managed to AP by 3hrs 45
S: 20 minutes most recently. This gave shorter / fewer nws than allowing 30 minutes here. This usually falls at around 2.45 - 3.15ish
A: About 4 hours
S: Aim for 7 - 7.15
But like I say, most days were 1 nap days from 10 months onwards.
I've had a really long and stressful day so I'm not doing a very good job of looking at your routine I'm afraid, but I wouldn't usually count NWs as A time when looking at my day. I don't remmeber making any signidficant changes after a 2hr NW - maybe just shortening his first A slightly - by 15/20 minutes. I can't really remember I'm afraid
It looks like your LO maybe needs an afternoon A of around 4.5 hours after a good nap? You might need to move your cat nap earlier, too (you could cap your long nap to achieve this). Jack has always done almost a full A after a short nap, so I'd probably aim to still have around 3.5 hours after a CN, depending on the length. It looks like you're kind of at the point where 2 naps is too much, and one is not enough... It's a really tricky one. You could try something like Jack's routine at this age, but swap where you put the longest A time, depending on what your LO prefers. Jack always needed a long morning, and a shorter second A, which is how ours came about, but you could do a short AM nap and then a long PM nap with a 4.5 hr A afterwards if that would suit your LO better? We did something similar for a while, with an UT capped nap as early as I do AP it in the morning, and a long nap at 1-2.30 / 3ish I think.