I do exactley the same thing, make a triangle first and wrap only her arms down. I am using flannel wraps at the moment, maybe I should get some muslin ones, at least if she manages to get that over her face she will be able to breath through it.