Hmmm… that ordering is probably the least problematic way to include the Republic/Resistance tension you brought up, though I share your reservations about it, but it might be okay to be away from Rey for a while if it sidesteps the other problems.
Meanwhile, here’s an earnest attempt at an earlier, alternate solution to this problem:
https://vimeo.com/244748972
password: snokeJEDIT: NeverarGreat, that clip contains some interesting ideas. I like how you have Rey gradually discover her abilities, and build tension as Kylo Ren stomps toward her cell.
This looks good, with the exception of the audio transition into the Snoke scene sounding pretty rough.