That might work!
Edit: Also, your version of “Lightsaber Lost” has a crawl that references having just faced off with Hondo, yet where your episode order places it, they haven’t met him yet. Did I miss an update about that episode that you haven’t gotten around to yet?