^ what he said. The Yoda scene can be used to help Luke realise that with Rey, he should train her outside of the old Jedi traditions.
It’s a very warm scene which then can lead into the Luke/Rey training scene. The whole thing should feel quite triumphant.
The TROS training scene could just be useful the improve the pacing a tad. It’s basically Rey swinging and slicing. It could even be cut in to pretend that she’s doing this on the island itself with a touch of recolouring .