Perfect Hal, it all sounds really good to me. I agree it’s probably best to keep both lines because of the fact that your edits are so widely used by this community.
My own TLJ edit solves my own niche requirements about the movie, and that’s enough for me. I highly recommend creating personalized versions of some fan edits. Everyone has their own ideal fan edit, and I find it’s much simpler to remove content rather than add it back in.