I think he is likely hitting a growth spurt in addition to needing to stretch his feed cycles. His A time seems a bit long, you might want to start that wind-down 20 minutes earlier so his total A including feeding + play+wind-down is between 1h and 1h15m. If he is crying during the A time he is already OT, this is probably why he has the short naps. OT can also cause NW, but with y'all so new to EASy it's really hard to sort out if they are hunger or something else, it will get straightened out in time.
That feed 15 mins later was just too soon, he was still full. Getting more into him at each feed is a matter of letting him get a little more appetite, so instead of feeding every 2h, you might distract him for 5-10 minutes before the feed. Then each day you push the feed times apart just a tiny bit. We're not talking about jumping straight from a 2h routine to 3h, but just a little tweak each day. Sometimes if the naps get better they will surprise you and put themselves on a 3h routine by sleeping longer, but I wouldn't try to force it.