Two questions: Day naps & swaddling

1. My little man, nearly 9 weeks, is impossible to put down during the day for naps! He usually only sleeps for 30min - 1hr when I hold him (he’s a great night time sleeper). As soon as I put him down, he wakes up and screams.

I’ve put him down in the position I’ve been holding him in, swaddled him, white noise, patting his bum, singing.

What tips and tricks do you have?

2. I’m not sure if it’s time to transition to next swaddle, we switch between wrapping in blanket and the LTD swaddle. He hasn’t rolled over yet, but he’s a real squirmer, he’s rolled into his side and quite often i find him on an angle after his sleep at night. It is time to transition to arms out?