Rolling and Sleeping

My baby just started rolling-- he can roll from back to belly but not the other way around. He can only roll on his right for now. He had mild torticollis so his head and neck control still needs some polishing. For the most part he will lift his head up when he rolls but sometimes he can't lift it and just shoves his face on the floor or mattress.

Unfortunately, when he is sleeping, he doesn't even try to move his head sideways, he just leaves it shoved on the mattress. He'll whine after a while, but when we flip him, he rolls right back seconds later.

He is in a pack and play in our room and unfortunately our bed is too high to put it right beside us and even if we do, there is no space for us to get out of bed in the middle of the night without waking anybody up.

So literally everytime we fuss or cry, we have to get up and see what he needs-- and this time he is doing it constantly. He gets waken up with him rolling and he gets frustrated that he can't breathe yet also too sleepy to care.

He does not sleep anywhere else but the swing or carried by someone during daytime so his bedtime is really our only time to get some rest-- but that has been so hard lately.

I took the rail on his crib and put the mattress it all the way down and plan to put my airbed right next to it so I can help him either roll back or move his head when he rolls. I am thinking that it'll be safer than me carrying him all night and falling asleep or him just shoving his face on the mattress and me being too tired to hear his call for distress.

Any thoughts or suggestions on how we can help him or make it a little easier for us?