DD1 still wakes up at night too - and we just give her some milk and then she goes back to bed quite happily. Before we thought of giving her the milk, she would be up for 4 hours, whinging and crying and nothing we did stopped her and made her go back to sleep like the milk does.

Maybe you could try that?