If it's taking her so long to fall asleep, I'm wondering if she's ready for more A time. By her age, most bubs are doing 3-4 hrs of A time, so you may want to try extending her A time, just by 10-15 min every 3 days or so and see how that goes.
hth
michelle