Sleep problems - redux

Unfortunately, Passover kicked off a really bad sleep pattern for Aida, she has been waking up all night. For the last few months she had settled into a pattern of waking up twice a night to nurse, which was not great, but was survivable. We're working hard on adjusting her sleep, I'm limiting her feedings and rocking her at other wakings. She's still in a swaddle, though, and we're going to need to get her out of it, probably in a few weeks when she is 6 months old. She still hasn't rolled from front to back, so it's not a problem yet, but we'll have to get her out of it eventually. We've already tried twice to wean her off it, for 3-7 days at a time, with no luck (and no sleep on those nights).