Yes, that looks fine now. The only minor fix needed (in my opinion) is that you need to either put a klasma on the syneches elaphron in the English melody in your attached PDF file, or you need to use the beginning of the Greek melody in your attached PDF (which has a syndesmos and no klasma on the syneches elaphron). The reason you need to fix this is because as it is now, your melody has a three-beat measure in it, which neither of the Greek sources you are combining had.See attached .pdf for my post.
As for your question #2, I'm quite sure that the ornate and simple cadences are interchangeable. I could probably prove it if I had these formulas codified.