Help! To swaddle or not to swaddle

Katie
So my little guy is a little over 7 weeks. I found his moro reflex is so strong that I started swaddling him at night. I find he gets much longer stretches this way (was 7.5 hours straight but now his 7 week growth spurt has him eating again at around 3 am going about 5 hours). Well I'm finding now he's not napping well because he's waking himself up flailing his arms,so we're getting cat naps and he can get pretty crabby by the night. So should I swaddle him for naps now? I really didn't want to because I few they need some sort of freedom during the day but he is not napping well during the day unless he's laying on me. Anyone else have or had this problem?