I would probably say if he tends to keep his face down forwards when he gets tired, I wouldn't really be comfortable letting him roll while fully wrapped. Have you tried having one arm out? That would help him roll back over but still make him feel secure?