We wrapped Aidyn until he was about 6-8 weeks, which is when we bought him his first Grobag.
He never really liked being wrapped and would always struggle to get free, and then end up with the blankets on his face... which is why we decided to use the grobag.

It sounds like it really works for Gabby though, and must make things a bit easier by helping her drift off to sleep!