I think the space battle and Tosche scenes would fit better at the end of Rogue One.
Leia is already on Rogue One, so why not Luke ? It would tie up both films perfectly.
Or how about going short-film style and making those scenes into a stand alone feature ? A sort of a fan-film set just before EpIV…