Halo Sleepsack swaddle overheating?

For the first three weeks I put my son in a onsie or cotton pajama and then a SwaddleMe swaddle sack. The Halo swaddles were way to big on him.  Now that he is bigger they fit but he seems to get sweaty in them.  Does anyone just put their baby in a diaper in a swaddle wrap to prevent overheating?  He seems to like the Halo wraps more because his legs have room to move and I can get his arms wrapped pretty tight.