You poor things, we went through a similar time when my son was 5 months old, for us it was the swaddle that was the issue, he really wanted to have his arms out, yet when he did he woke himself up. All the advice I was given was to keep re swaddling in bigger wraps and really firm, it did not help us and I eventually decided to try the sleeping bags. It took about 4 days but now he sleeps really well, he still wakes once in the night for a feed (we are working on that) but generally his sleeping is MUCH better. Don't know if this helps you at all but it will get better!!!! Goodluck