7mo been swaddled since birth and now can roll over. He currently gets wrapped in shawl then sleep sack on top. If I take the shawl away will the sleep sack be warm enough? The room is 19-20 degrees celcius overnight. He usually just sleeps in babygro, maybe add a cardigan? The sleepsack is 2.5tog and sleeveless.