I think the re-recordings and suites are worth having as alternative takes on the music, and they have some nice bits that are uniquely theirs. But it will definitely be good to have the original versions at last. There are some bits that I definitely prefer in their original form.
, how much diegetic music will be on the set? I think you did confirm earlier that the "Way to Eden" songs (mostly) would be included, but what about things like the lounge music from a couple of early episodes, Uhura's singing and Spock's lyre playing from "Charlie X," "Beyond Antares," the harpsichord music from "Squire of Gothos," and the Brahms paraphrase from "Requiem for Methuselah?"