As for the Elves, they could be given riders on pegasi, unicorns, etc.
The dancing units don't necessarily need to be removed; they could simply be given a bit more armor and a better, more realistic animation. (IMHO)
Я - рыцарь, Зверей истребитель!
Я - тот, кто не знает, не ведает страх!
Я - Божий Сын, победитель!
"Без жалости! Без сожаления! Без страха!"