Trapped wind in breastfed newborn

My LO is 4 weeks old. He has terrible gas/trapped wind. We've been working through it, keeping him upright and burping him. I know he is approaching the time when it's at peak and I know it gets better but last night was the worst yet and nothing we were doing was relieving it. He is becoming very fussy when feeding, he is obviously uncomfortable, and he is not latching well which i know will be making it worse. I feel like we are a bit trapped in cycle of bad latch increased wind ... increased discomfort leading to bad latch. Up until now he has been feeding and latching well, he has been putting on weight. I know it will get better but it's really difficult while we are in it! 😰 Would appreciate any tips or similar experiences and how you got through it? Thank you ♥️ ( I will be talking to the health visitor as well if continues or I'm worried about his weight)