Unit Speculation?

[Karl08]

You have te-yari listed as a "long spear". Te yari was, in fact, a very short hand spear, about the length of a jo or less (it's even in the name: "hand spear").

Also, even though we see illustrations of samurai bravely charging in on horseback wielding naginata, the nagimaki was more of a "mounted" version of the naginata. The naginata is too long for effective use from horseback.