Transitioning out of swaddle and sleep training

So our LO just turned four months. He's been a fantastic sleeper, going down pretty easily around 9pm, getting up around 3am, then going right back to sleep until 7:00 or so, then usually right back to sleep after that.

Our sleep routine was pretty much always swaddle, feed, he passes out and we put him down. But at the four month checkup the doctor said it was time to stop swaddling. Our fault for waiting so long, but...the sleep was so good! Lol

So now we have to go cold turkey on the swaddle transition, which I get. That's been a challenge, but what's most successful is bouncing him/rocking him, then laying him down once he's OUT out.

But we've been trying to use this time to break other habits/create better ones, like getting him to fall asleep on his back, not being held. So that's been three rough days but it usually ends with me saying "fuck it, he needs to rest," and picking him up till he falls asleep. And then the night goes pretty well!

Haven't gone all in on sleep training yet because we haven't educated ourselves enough, chosen a method, or gotten on the same page about strategy yet.

So: should we not try to fix what's not broken? Or is it worth it to try to develop better habits while we're dealing with the sewage m swaddle transition?

I just started six weeks leave, BTW, so if I'm gonna have rough sleep then it's a good time to do it. But we also might be traveling for the holidays soon.

Thanks for reading all this!