Hi amj!
Well, it does sound like your routine is getting a little better. So thats good! Its just the crying before naps/bt thats an issue right now? And to be honest i cant really suggest anything, im sorry, except keep up with the pu/pd in hope that she realises that this is nap time i need to sleep. I actually am not sure why she would have an issue with self settling all of a sudden, apart from SA or teething pain. Or that she doesnt want to go to sleep she wants to stay up & play with mummy! Just keep being consistant i guess xx