Advice please

Today my baby girl is one month old. It honestly is going by so Fast! I need some advice when it comes to bedtime. Of course she is still going to wake up several times to eat but how can I help my baby girl.relax? We have a routine that helps us get ready for bed but she always startles herself awake. She hates being swaddled traditionally but is doing well swaddled in the Love to dream swaddle. Typically she does well if she falls asleep in the car seat on long car rides or if she falls asleep in her swing. It seems like she isn't a fan of sleeping on her back in per pack n play. When she's awake she will kick the changing table therefore keeping her awake. The only way I can get her to relax is if I have her up against me laying down in bed as if she's needing to feel more secure and safe. Is it possible that her pack n play has too much room and that she's doesn't feel secure in it? Should i look into getting a bassinet or some sort of pillow like the dock a tot? What advice can you recommend? I love her to death but don't want her to stay in our bed forever

Side note: shes been gassy and switched to simliac alimentum. After she eats, she burps and then takes about an hr to settle back down and go back to sleep after eating.