My DS did basically the same thing smack on 5 months. He kept knocking his dummy out and waking himself up. I also wrapped him and it was about that time he didn't want to be wrapped but couldn't sleep without being wrapped.

Despite the fact that it seems like it will go on forever, from the sounds of it he just wants his mummy at the moment which is an entirely normal and healthy thing. You won't 'spoil' him by helping him to settle, in fact you will teach him that mummy is right there and he will gradually learn to self settle with time. I agree with the sling suggestion, I know they can be heavy to lug around but it is so much better than having to deal with an unsettled crying bub. It is a exhausting job but it does pay divedends. Just think before you know it he will be a pimpley teen who is still asleep at 2.00pm on the weekends driving you nuts.

Hang in there.