Meg, you sound like you are doing a great job. I could never wrap DS as he would just fight his way out of it. He wasn't a great sleeper in the beginning, until I put him on his belly to sleep. Not that I recommend you do this if you don't have a breathing monitor, but some bubs sleep much better on their belly, especially if they have wind or something as the warmth helps to settle it.
During the day I would let him sleep on the chaise part of the lounge, and I would sit there and just watch him and make sure he was breathing etc, as he was on his tummy, and I would sit there for a while, toddle off to do something for a few minutes, come back, watch... toddle off.. you get the picture. So it was a solution for us (although doesn't come recommended!!!)