Yeah that would probably fit quite a bit better given time constraints.
Honestly, it makes much more sense for canon to be that Leia didn’t train beyond building a lightsaber and some dueling techniques. I doubt she trained any longer than a year. For that to be the last night of her training is kinda crazy.