Thanks for the side-lying tips, Tarah! I will give it a try this evening. I was trying to lay her on her side, too, which wasn't working well.
WRT swaddling, do you curl DS's legs up? Now that she is getting bigger, she is resisting when I try to do that (but is OK with having one arm/hand inside).