Those EWs may continue for a bit til you get her solidly on one nap - you might want to try pushing that A time still - very, very, very gradually - and at the same time, cutting her pm nap a wee bit. So that pm nap becomes more like a catnap. That will bring her bedtime earlier too. Eventually, you'll cut out that pm nap altogether - once the am nap gets closer to a lunchtime nap.
If her am nap is short at daycare, I'd put her down earlier for the pm nap (if you can) and let that one go a bit longer. If that doesn't work, then yes, I'd move bedtime earlier.
Glad you are seeing progress!!!!