My 12wo son is too big for his swaddle blankets and it's getting too hot in our room! He sleeps in a sleepyhead mattress on an old nightdress of mine in a swaddle. He also sleeps on his side with a rolled up blanket to keep him in place. I wanted to put him in a gro bag now so I can use the right tog for temperature. His arms wake him up!!!! Any tips at all?