Hi there,
Physical development and teething play havoc with sleep so that could def be the cause of some of the issues. I find also that teething brings out SA in both of mine so that won't help either.
As far as the routine goes I would imagine she is starting the 2:1 transition. She is sleeping a good night so she may be a wee bit UT tbh. I think it is probably time to think about capping one of the naps to about 45 mins. I always did a short am nap and a longer pm nap with my two but if her am nap is the better one you may prefer to keep that and cut the pm nap back.
What do you think?