In short, I just removed the superior gear from the merchant, and we'll do without swapping equipment for units — let them stick strictly to templates, no need to complicate something that's already not going fast.
And can the Knight at least convert one piece of gear into a consumable?