I suspect you might end up with 0-1 Kn(F) wedge, 0-1 Kn(F) or (X) and the rest as Kn(X).
Do I have to update all Kn to X or is it optional?
The 0-1 Companions do not upgrade to Kn (X). The 0-1 Agema may upgrade to Kn (X). The 2-7 Line Knights must upgrade to Kn (X). 0-2 generals may upgrade.
Of course, this is all what is spelled out in the DBM list book. No one knows how much the list may change when it is published for DBMM.
and have fewer elephants all as (S)
Still max 3 elephants.
But now getting very expensive.
On the other hand, drop those two bolt shooters, and that frees up a lot of the points you need...