J.F.
First off swaddling at that age is just crazy, so give up on that!
He is too strong and moves too much to have anything hold him.
Second WHITE NOISE! It saved my life... We have a fan in our kids rooms in the summer and a humidfier in the winter. Get a cheap one that is noisy!
You will be shocked how much it helps to drown out any outside noise and he can fall asleep and stay asleep!
With my youngest (10 months) I rock her while feeding her and then lay her in bed. She does cry a bit, but I walk straight out of the room and she gives up after a few minutes. We do have a crib aquarium light thing that plays music and/or bubbles that I turn on as well. Lights up the room and gives her some other sounds to hear for about 30 minutes. We also have some books and a few hard toys she can play with until she falls asleep on her own.
Also DARK! We make sure both rooms are very dark.... we do have night lights, but for the most part the room is pretty darn void of outside light.
This will pass... it takes time for sure. Just keep at it and he will get it. But give the white noise a shot! Best advice I was ever given!