Our ds is now 8 months old...we swaddled him until about 4 months and he always woke up crying. Once we were able to start leaving one arm out, then two, he started waking up happy. But, like you said, the swaddling was necessary to get him to sleep well. You'll just have to wait until you can start unswaddling to enjoy an extra 10 minutes or so while baby entertains himself!