mine settles pretty well. I burp him abit, change his bum, wrap him back up tight, and pop him back into bed. For me, the key has been wrapping him properly, he hates being wrapped loosely, and if he can get his hands and feet free, then he kicks and carry's on. Also, the dummy does work wonders.
Oh, and congrats on the birth of your daughter. I love the name Mckenzie.