It sounds like she already has the ability to self-soothe, so I think the best plan of action is to shore up your routines and sleep cues so they are predictable and consistent. Work with daycare so you can match each other as much as possible. If you can get the drowsy-but-awake thing to work again, awesome, but you may have to do some sleep training with some crying. For us, I thought I'd have to listen to my baby scream, but he was like a Pavlovian dog for his nap and bedtime routine, so when I finally put him down awake, he just played for 10 minutes and fell asleep. It was amazing. But not everyone is so lucky, so do some research on a sleep training method you can commit to. If it were me, I'd ditch the swing and just go straight to the spot I want my baby to sleep in (for me, that's a crib in his room). What ever you do, be consistent and stick with it!