HI there Sarah, big hugs, they are so so new at that age and your priority needs to be sleep really - for both of you. Have you read the BW books and are you familiar with Tracy's theories and methods?
I would strongly recommend continuing to swaddle, and it has to be tight tight. Are you using a blanket or a pre-fabricated swaddle? I know they fight it, Finn did too, but honestly it was the only thing to calm him and help him sleep better.
We do need to see your routine to have a good look at what is going on. At 7 weeks they are pretty much eating, burping, changing and then winding down to sleep again. Do you have a wind down routine with him? Have you tried shush/pat when you put him down in his moses? Does he take a pacifier/dummy? Have you heard of using white noise and have you tried it with him?
Does he sleep with movement like in a swing or stroller? Or do you have an infant carrier so he can sleep close to you on your body?
How are his nights? Do you suspect he might have his days and nights mixed up?
The thing for LO's this age is to recreate the womb conditions as much as possible.
Let's see what your routine is like and we can go from there.
