Swaddling

My daughter is 2 months old and tries to get out of it in the beginning. She usually falls asleep still swaddle, but as she starts waking up she struggles again. I am also having problems with heat rash on her belly. I want to stop swaddling, but know she is not ready. (I did try without the swaddle one night and she kept waking her self up with moving).  What is everyone else doing if your child is fighting the swaddle?