Swaddle transition help?

My 3.5 mo baby girl has not yet rolled over so i am starting to transition out of a tight swaddle. I bought the zipadee zip suit but the first night I had her in it she pooped all over it and now I have her back in her old swaddle which will not last very long... What do I use when the zipadee zip is in the wash? I also bought the Merlin Sleep Suit but am worried it may be too warm for her. Any thoughts? What do I use when the suit I am training her in gets dirty and she still needs sleep?