Andrew

This exactly. Whatever the original intent, at this point, the Omega Glory, mistake or not, and In A Mirror Darkly, mistake or not, would appear to override the behind the scenes intentions of the time.

It does make court-martial a little more confusing, admittedly. But you've got an odd man out to explain away in either case, and in this case, the on-screen cannon of at least two episodes would seem to override the one.