moving baby to crib

I need tips on moving my son to his crib or at least the pack n play by our bed. He's been sleeping in a rock n play overnight next to our bed- at 2 weeks we tried the pack n play beside me and he wasn't having it- no one got sleep for almost a week. He's 4 weeks today and I wanna start moving towards the pack n play in our room or crib in his own room. I'm worried about his safety in the rock n play and his head ending up flat- even tho we do lots of tummy time and baby wearing during the day. Sooo any tips or advice please! And he doesn't like being swaddled, no matter what type of swaddle he just screams!