Outgrowing the miracle blanket

The miracle blanket is no doubt one of the best buys for Aaron. I truly believe it helps Aaron stays asleep better at night as he's wrapped up like a mummy/burrito (whatever you like to call it) LOL! We love it so much that we stretch using the miracle blanket way beyond the recommended age (14 weeks) to all the way 5 months.  We recently have to make the switch to swaddleme, of course his arms broke out of it within 5 minutes putting him in.  He kept waking himself up 3, 4 times in the middle of the night, which is not fun for daddy and mommy. We don't know if there's another better solution, as he can't be swaddled when he's about to roll over. Perhaps we just need to let him get used to sleeping with his arms out. I am just seeing more sleepless nights. :(