Help!

Our little guy slept in the rock and play (I know, recalled and dangerous) at first as okay’ed by our pedi for his really bad reflux. He got used to it. Then we stopped as soon as the recall plus he was getting bigger. He napped often during the day (right next to me when I was awake) on his boppy lounger pillow when his reflux was still bad. Well now that his reflux is much better, he hates being flat. We also stopped swaddling a few weeks back which has been a struggle

Any tips? Last night he slept in the pack and play from 8pm to about midnight, with us calming him once or twice. Then from 1am on we had to soothe him every half hour at least. He’d just wiggle and cry no matter how much shushing or patting or calming words. We’d pick him up rock for a few sec then put him back down.. But the second we hold him he is out like a light in our arms. Then wiggly and awake when we put him down. Ughhh we’ll never be able to have anyone baby sit at this point!!