I'm afraid I'm not so good at reading EASY schedules and calculating how long they have been awake, but I thought I would share what worked for my lot and see if you think it could help you. I must say that I think the unsettled evenings and nights sound like a build-up of OT, maybe from you pushing the a times, so it might be worth trying to get a bit more day time sleep for a few days and see if that helps. I must confess that it is a little while since mine were that age, so I might be a little off on the timings, but hopefully this can give you an idea:
WU 7am, feed
Nap 1 8.30/8.45-10, feed
Nap 2 11.45/12-2, feed
Nap 3 about 30 minutes somewhere between 4 and 5 (awake by 5)
Feed at 5 and 6, then asleep for 6.30ish
I did sometimes find that it helped to give a small top-up feed at about 11 to make sure they made it through the long nap in the middle of the day. I found that this worked, more or less, for all 3 of mine (with our fair share of short naps and tricky spells!), and it worked for me to be able to plan things and get out to activities etc.
From about 5.5-6 months I found that nap 3 became a problem - they would normally sleep for it as it was generally a buggy nap, but it did tend to interfere with bedtime. Having said that, if they didn't have it then they would be OT at bedtime and that was just as much of an issue!
Hope some of this helps.
Posted with creations - I did find that the morning a time was much shorter than the others for a long time. It can be habitual, but I know that for mine it was just what they needed. In contrast, they coped well with a long afternoon a time quite early on. Perhaps you can try one suggestion for 3-4 days and see if it helps, and then try the other for 3-4 days if it doesn't. It does take that long to see a change, so you need to be consistent for those days to see what is going to work for your lo.