Here’s what I’d use for the first scene:
https://drive.google.com/file/d/1eOmiPm1fLaog_PvYVMH-w6kNxCmnAYJ1/view?usp=sharing
https://drive.google.com/file/d/11EQ8uHXiEJBgntwghxnnmqogN6EJpA2S/view?usp=sharing
And here’s something similar to what Burbin mentioned for the flashback:
https://drive.google.com/file/d/1hV4s01PHj2_daV9oUlJ1X2txf1fuvjlh/view?usp=sharing
EDIT: On second thought, it may be best to simply ignore Leia knowing something about Rey (keep it the way it is in v2) but replace the other line in the flashback.