Speaking of foreshadowing story elements for TROS in TLJ, have you considered trying to foreshadow Finn being Force-senstive at all? I think it would be difficult to remove the implication from TROS, but I don’t really know where in TLJ you could put hints to that. Maybe before he wakes up, he could hear Force whispers like Rey, or hear an echo of Rey saying “Finn”, which is why he wakes up saying “Rey!” It would also parallel the “Luke.” “Leia!” interaction later on in the film between the siblings.