My oldest is spirited too, and I found a longer wind-down really helped. I tried to keep bath time calm, then read 3-4 books, rocked & sang quietly, and the whole routine took almost an hour but since she went into the crib calmer it was easier for her to get to sleep.