Hi there,
I just wanted to post as I can relate about the hair comfort thing! I have to bend over the change table the whole time I'm changing my DD so she can pull on my hair.
One thing is though, although she prefers my hair, she does use her own hair to go to sleep at night. Try the GW and see how she responds. You can every couple of days you can move towards the door, and then you can start shutting the door a few inches at a time. So she sees full mummy, 3/4 of mummy, 1/2 of mummy, etc.
My LO loves a nightlight too.