hates to be swaddled but can't sleep without it

TTnoles

My LO is 2 months on Sunday.  We have had to swaddle for evenings due to his startling waking him up.  He hates it though.  Initially he will resign to the fact that he is swaddle and sleep a great first 4 hours but after that when he wakes it is a battle.  I hate having to swaddle him when he dislikes it so much, but he wont sleep on his own otherwise.  I should mention he actually likes to sleep and has no problem falling asleep, its staying asleep without the swaddle.  He sleeps in the RNP as well.  Anyone else struggling with this? tips? suggestions?