I think that’s the best move honestly Smudger.
Though I think you may have more to work with in your first two movies once Ashoka comes out, considering we appear to be seeing Ashoka’s journey to finding Morgan Elsbeth. Once we have more on Elsbeth, her fight with Ashoka may feel more acceptable as a movie ending with all the build up to it. With a little rearranging you may also be able to push all the content forward a notch, allowing you to also end the following movie on Luke’s appearance.
We will have to see though!