Thank you, Chelle. We've actually just stopped swaddling as he didn't seem to need it any more. And last night he only woke once! I did wonder about continuing swaddling through the transition for some sense of normalcy, and to recreate the sensation of being in the Amby. I don't think reintroducing it would be too problematic. A blankie is another good idea, but at the moment he gets too excited by his "love love" upon waking rather than using it to soothe himself back to sleep.
I'll check out the other link.
Thanks!