have you tried a stuffed little lamb???it was my first night nappy before I found wee notions night notions and it never leaked, just layered it with hemp/bamboo inserts. Wool or fleece are good as wraps, fleece is cheaper, but not much good if your little one sleeps in one position all night. There are pockets you can use at night that would not require a wrap.
Here is a link to a thread on a website devoted to nappies, lots of second hand ones always for sale in the classifieds, hope this helps
www.clothnappytree.com/forum/viewtopic.php?f=42&t=49098