you are doing great!
I would definately not stick to nap "times" at his age.
It is absolutely fine to have some activity before feed. As they get older, the milk feeds drop, solids pick up, and thus the EASY gets sort of tossed out the window. the basic premise behind EASY is to not breast/bottle feed to sleep, so everything you are doing is right!
If he he is sleeping well at night, (11hrs+) then 2 naps of 1hr 15min-1hr 30 is sufficient at this age. I would not try to extend any naps over 1hr, as this is considered rested.
the earlier wakes do get a bit tricky, so post back if you have further Q .