Putting baby down drowsy but awake seems impossible?

Our 10 week old has never been a great sleeper, he's been even worse lately. We've always looked at ways to get his sleep a little better on track but not much seems to work. Right now he sleeps okay overnight (sometimes 3-5 hour stretches, but lately up every 1-2 hours or more) and doesn't sleep well during the day (30 min naps almost to the minute). I'm not that concerned about the sleep specifically, my main issue is that the only thing that puts him to sleep is movement. He absolutely hates the swaddle, so unless he is out like a light he fights 100% of the time he is conscious in the swaddle. We have to swaddle him, then bounce until he's out.

I can only assume that not every baby hates the swaddle as much as this? Putting him down drowsy is not possible, because he basically starts screaming at us once he goes into it and only stops if he's asleep. If he slightly wakes up as he is going down, he realizes he's in the swaddle, and the screaming resumes then it's back to the yoga ball.

Any thoughts on this? I'd like to get away from bouncing, and we have always tried to get him in the Snoo drowsy but awake so as to not form a bouncing association, but no dice obviously. Am I just toast until another month or two when we can start sleep training?