I'm with the feeding to sleep contingent. It works pretty quickly usually, and I think now she goes to bed before me and is on her own for a few hours quite often her early wake ups just seem to be for reassurance, and that's the easiest way. Plus also I would struggle to sleep for ten to twelve hours without having a drink of something.
That said, bed times are something of a struggle at the moment. She goes down ever so quickly after a bath but then wakesever half hour or so until I go to bed, so it kind of defeats the point (getting a bit of evening to myself). Not sure if there's anything I can do other than persevere.