Once we were on 2 solid naps the EWs eventually went away, and other than the odd time haven't really returned, even through the 2-1.
It's a dance and honestly while going through the 3-2 every day is different. The best thing you can do is push those A times, especially the first one, which I know you are doing. At a certain point even with EWs I didn't allow a nap before 9am, and just resettled if she woke at 30mins.