DD was similar around this age but the weathe was warm so she was getting out of the wraps then wriggling under them so we decided it was time for sleeping bags and her cot. No sheets, blankets or wraps, just a sleeping bag. She slept right through the first night and we never had an issue Some little ones can surprise us! I cried moving her into her room but I quickly adjusted. We had the Angel Care Sound and Movement monitor in her cot so we could hear her no problems and the alarm would go off if she stopped breathing - it never went off thankfully

Good luck with whatever you choose to do.