I'm guessing he is ready for a bit more A time - I'd start extending just 10 or 15 min every 3-5 days. It can take several days for an A time change to result in longer naps, so try not to change it every day, give him a chance to adjust. As you extend A times, you can probably skip the catnap as his naps lengthen. You may want to put him down to bed a wee bit earlier as you're doing this. I'm guessing he's OT by the time bedtime rolls around, and that's why you have the screaming. Your EASY does actually look pretty good, I'd just start extending A times and go from there.
Whenever Abby naps over 1 hr, I never bother extending, as that's a good UT nap for her, and she will not go back to sleep. So I wouldn't bother extending if the nap is over an hour, but just watch for tired signs because he may not be able to handle an extension of the next A time.
hth
michelle