I still need a little help. The total number of night wakings have decreased over the last week. Last night, he only fed twice!

However, getting him down for the night and getting him back to sleep is very difficult. He cries and escalates to screaming for about 30 minutes before he falls asleep. Shush/pat doesn't do anything, and pu/pd seems to make things worse. I end up rocking him to sleep and patting his back. We don't have this problem with naps. Here is our last day, starting with bedtime.
8:00 - Alseep (crying and rocking for 30 minutes)
10:30 - NW1 - nursed and asleep.
10:50 - Awake again, screaming for 30 minutes. It took a lot of rocking and patting to get him back to sleep
3:30 - nw2 - nursed and right back to sleep.
7:10 - E and A
9:30 - S, 2hr 15 min nap.
11:45 - E and A
2:05 - S, 2 hr and 5 min nap.
4:10 - E and A
6L40 - Start bedtime routine.
7:00 - Nurse.
7:30 - Finally fell asleep after 20 minutes of crying and rocking.
Are the difficulties due to him being overtired? THere's not enough room in the evening for a catnap, but the last A time ends up too long. I'm not sure what to do. Also, if his problems are due to being overtired, will pu/pd work, or should I continue with the APOP?
Thanks!