Hugs for the nw's. It's hard when they were doing well but seemingly overnight things change!
A couple of thoughts -
If you want to increase your As, I'd start with the first one, just a bit (10 - 15 min). I've noticed that his A before his CN is long so this may be contributing to a bit of OT prior to BT.
What's he doing developmentally? is he starting to roll? Around this age, some bubs, resist the swaddle. If he's not doing well with one arm out, what type of swaddle are you using? I've heard great things about the woombie type of swaddle. However, if he's rolling, then I would bite the bullet and wean the swaddle.
Do you think he's teething? sometimes the teeth are starting to move around and will disrupt sleep. Check out his mouth to see if there is any teeth ready to cut.