{{{{{{{{hugs}}}}}}}} Bethann.
I'm working on the same issue, although Callum's a few months older. He was falling asleep holding my hand, and taking ages to do it! I've adjusted his routine a bit and he's going down more quickly again, and I've done GW to the point where he'll go to sleep with me sitting in a chair near the cot rather than right next to it. My mum's staying with us right now, so I've paused the training, but my plan once she goes is to start doing wi/wo. I know he can fall asleep without physical intervention from me, and I think that wi/wo will be the most effective way to get him falling asleep completely independently.
FWIW, if I were you I would continue with GW for now, and play around to get her routine right. I would personally hold off wi/wo til those 2 things are sorted out, especially the routine. Wi/wo will take ages and be really hard if you're trying to put her down when she's not tired.
For us, the GW stage took a week or so, and didn't really fall into place until the routine was fixed. HTH