How to improve His Last Vow and write an ending that makes sense

So one more thing, and then I'll try my hardest to leave the matter alone. I've thought about it for like, fifteen minutes, and came up with what I think would be a better ending to His Last Vow. Here's how I would rewrite the episode:

( Under a cut because SPOILERS )