Hey ryn,,
It is so hard when bubs dont sleep.
I had a similar problem. recently i invested in a grobag coz i thought he might be to cold that helped a bit.
Yesterday I went to hire a hammock and it worked wonders...
I know you have something similar but this cocoons bub nice and snug. i didnt hear a peep from him.
Mind you tho we spent 3 hrs in A&E coz bubs was sick. he may have slept well coz he was over tired....
I also tried a vapouriser with lavender oil in our room and it really made a difference too. I also found that mobiles and music aggravated nixon and went to sleep when it was a bit quieter...

all the best !!