Star Trek Discovery is incompatible with any and all established Star Trek history, lore and canon.

Instead of muddling around with it even further simply remove its canon status and let it live on as an alternate interpretation of the Star Trek idea - a tribute or homage if you will.

It cannot and will not ever make sense as a part of Star Trek history, lore or canon, so the time is now to change the canon status and fix the mess.