I was doing the exact same thing and getting my DD up to eat when she was thrashing around, when the reality was she was just self settling. Now I wait until she actually cries and then feed her because often she will toss and turn for a good while, seeming like she is going to wake, but then drift back off.
Completely understandable to want to get into a new routine, we are trying to get there as well and I often have to remind myself that they are still so little and sometimes just need some cuddles and help to sleep.
I would try to follow EAS as much as possible during the day, but there will likely be times when you get an EASAES pattern which is normal and ok too until those A times and naps lengthen.