I would be tempted to tackle the naps 1st and see if it helps the Nwing since you said she has slept well on some nights. I agree with PP to stick to a longer 1st A time for a few days and see what happens. Personally I would let her sleep as long as she wants so she gets used to sleeping longer as this will ultimately be the nap you keep and then adjust the 2nd nap depending on what she does. Can you tell I am not a fan of the slow 2-1 transition!