The baby can't fall asleep unless he's swaddled, he waves his arms and…

The baby can't fall asleep unless he's swaddled, he waves his arms and legs and doesn't sleep...but it's very hot now and he's all wet when I swaddle him and starts crying until I untangle him. How do you handle active hands and feet?