I'm with Warped 9 on this matter...what Enterprise retconned has no bearing on what was supposed to be happening in TOS episodes. It's fun to see how they might be construed as being consistent in some fashion, but TOS was first and the rules it sets are the rules it plays by.
As to the Organian Peace Treaty, everyone refers to it as something imposed by the Organians and enforced or not by them. Maybe someone mentioned this before, but I think it's more likely that the Treaty is something the Feds and Klingons banged out after the Organians smacked them down, in hopes of not incurring the Organian wrath and being rendered militarily impotent. This would explain why the Organians don't actually seem to enforce the treaty, because they had nothing to do with the Treaty, but their interference is what triggered its implementation.
Again, there had to be input by the Organians...the UFP and Klingons would not mutually decide to see who would best develops a planet for rights to it, it doesn't make any sense....it would be the Organians! If they felt the Organians would just disappear, then the superpowerful "UN" of Organians could not impose any enforcement...and do you see the Klingons going for that? Nope.