All right gals - let's focus on the positives!
Rory has been successfully de-swaddled! I was terrified of going all the way and the first night we did it, he slept 10 hours. Someone up there likes me! :P
He STTN 3 nights this week. If I can get a couple good nights in, I will take it!
The first couple nights of no swaddle, we did have to do the "binky dance" for a bit, but he can now settle himself even without the swaddle! In fact, as I hover over him, I'm pretty sure he waits for me to get out of his face so he can wiggle around for a minute and go to sleep. :P I consider this a miracle!