Lying back to feed can help - gravity slows the flow a bit... Burping LO well after a feed helps too, its a matter of figuring out the best way for your LO. Rubbing the back rather than patting helped more here, and a bit of tummy pressure with the heal of your hand/shoulder can help (not too much or he will likely vomit on you).
I went back and forth with swaddling, DS didn't need it at some times, then did at others until I ditched it when he started rolling. I am a bit fuzzy on the details but I think I swaddled in the day and not at night or vice versa for a while too. If he can sleep fine without, its not a drama to not swaddle - then you don't have to wean it