I can highly recommend the kiddopotomus wraps. I have been using them since birth with my DS. I am using the larger size now but because he is long for his age, he kicks his legs out so I just swaddle his arms. I'm not sure what I will do when he outgrows this one!
He can still work his way out but not as often as wrapping.
Good luck!