I know broom boy is a great scene for concluding Luke’s arc in TLJ, but I think I like it more as a hopeful ending to Star Wars as a whole than Rey Skywalker and the four hundredth binary sunset. Would moving it to TROS work? It’d have to feel like a kind of callback like the victory celebration in ROTJ, or the planets we see in this movie, or all the call-forwards in ROTS, rather than just obviously being out of place. It’d make TLJ feel a little less complete and self-contained, which is bad for that movie, but perhaps good for the trilogy since it’d carry momentum forwards better. It could be worth editing around the explicit mention of Luke Skywalker/the toys obviously laying out the Battle of Crait/the Rebellion ring to make the scene more generally applicable to the legacy of all our heroes.