eh, you've only got a few more weeks of swaddling, tops, before baby can roll over and you HAVE to drop it. but it would be nice to have it for couple more weeks, i know.
maybe try dropping it for naps first? and i second the halo sleep sack with swaddle wings. some people transition by first leaving one arm out, then both. we found it worked best just to drop it altogether. (which we did around 3 months)