I would personally leave the training stuff as is, for the reasons Nev mentioned earlier, but I am really curious to see if that caretaker restructure would work.
I’m not sure I understand Nev’s critique, to be perfectly honest. Rey’s moves are unrefined but I don’t find the scene comical at all.
The biggest issue with the scene for me personally is that the lightsaber is treated like a glowing stick rather than a deadly energy weapon. In the other Star Wars movies, characters took care to hold the saber away from themselves, but Rey almost immediately begins toying with it, flipping it around in one hand into an ineffective reverse grip (something that is almost always not done in sordfighting due to its limitations) and swinging it around with no regard for her surroundings, culminating in a complete loss of control and almost killing some caretakers.
So it’s not comical per se, except for the caretaker bit being played for laughs, but it does feel like it should be a strike against her readiness in the eyes of Luke.