Gassy fussy baby..help!!

I would feed my baby, burp, swaddle and try to get her back to sleep. But she gets so gassy and fussy. I tried gripe water and gas relief drops and doesn’t seem to work. Should I feed, swaddle then burp? She hates going back to sleep and often falls asleep feeding. The swaddle and burping makes her wake up and nothing works after. Any suggestions?