@KPM might I suggest, instead of boxing FMA? I say this for a few reasons.
1. the fact you train with three different ranges (largo, medio, corto), and the fact the threat of getting wacked with a stick or training knife HURTs, definitely rams home not just maintaining distance but transitioning and being able to function at multiple distances. As an example when fighting espada y daga, I may parry with my sword at largo but then need to close to attack with the knife.
2. At least the Kali I study has a largely upright, WC like, structure so you aren't essentially begging your opponent to brain you (which is especially problematic with swords lol)
3. The footwork, working the angles and zoning, is very similar to what we already try to do in TWC.