I think probably looking at your days I would push out the first A time to putting him in the cot at maybe 2h15-30. I think he's UT when you put him down at 2h, so is fighting. Maybe try 2h15 for a few days, then bump it to 2h30 fairly quickly if he's still fighting a lot. If PUPD hasn't really succeeded over a couple of weeks, when you've been consistent (as you have) then the routine probably isn't right.
I agree some of those 45/50 minute naps later in the day are probably OT due to bad naps earlier on so if anything I would shorten A times a bit as the day goes on.