Breaking the rock n play and swaddle habit

My DS sleeps really well in his rock n play and prefers to be swaddled. We had him in his crib but for the past week he was ill and our doctor recommended elevating his head for sleep. When he was in the crib he got up every 2 hours.

Any suggestions on how to transition back and retain a better sleep?