Rob,
I have learned that what I am doing to fold my diapers is sometimes called a newspaper fold. With diaper(s) flat on bed with insert(s) on top, fold the two sides in toward the center to overlap the insert. Next fold the bottom 1/4 - 1/3 of the diaper upward. Then spread the fabric at the top of the diaper to form the wings. Pin on the diaper.
This fold is only a little bit different from an angel wing fold but it leaves a bit more width at what becomes the top front of the diaper (which becomes the waist) once pinned on. I find that this makes it easier for me to pin.
I hope this helps as sit is more difficult to explain than I expected.
--John