I didn't realise you weren't "supposed" to do both! We swaddled our son- he much prefered to sleep like that and it painful weaning him off it months and months later when we was so active he was waking himself by unwrapping. We swaddled him and put him up between our pillows (spread wide apart from each other). So we couldn't have rolled on him and he wasn't under our doona either.