I think I saw a couple ladies talking about wool covers for a newborn last night and if it was worth it because of changing diapers so often and swaddling.
I was on my phone last night and it was too hard to post this, but I found this
http://www.babysleepbags.com/content/Merino_Kids_Cocooi_Babywrap.htm
and I think it might work pretty well. Plus, you can still swaddle with wool covers and not have compression leaks to a cotton swaddle. What do you think?