The other thing you can try Rach which I do, is top up feeding in the hours leading up to bed time. I do this with Sari and she sleeps now from 10.30-11pm right through til 4.30-5am!
There is alot of walking around holding her and bum patting etc etc in between feeds as she will stay awake from 6pm right through to bed time but at least then she has a nice big sleep. Usually her whinging is trying to do poos, its a bit of a long process this poo business ha ha