Turns out all Smem needed was a bit of discipline. The 'controlled crying' has worked a treat so far. The last two nights she hasn't fussed when I've put her down to sleep. And if she wakes during the night I just have to go into her once and she goes back to sleep again. Halleluja!
It did give me a chance to finish the new baby gift: