I would second the idea of a night routine. We do bath, short play with dad, then I feed him to sleep. It works well for us.