I agree. Outside of option 7, I think option 6 would be the most feasible “reveal” since we are just reworking shots and other material that already exists. It would still require some Kylo dialogue changes, but no elaborate exposition. But once an Option 6 or Option 7 edit was created, it could work well as a basis for an edit like Option 4, or a 4/6 combination like you suggested.

I think a good way to disconnect Ochi from Rey’s backstory would be to reword C-3PO’s translation of the Dagger engraving. Basically it would still give them the coordinates, but it would also say the the dagger is necessary to find the wayfinder. It would give a reason for Rey to split up from the gang and find it, rather than her having a random feeling about it, and it would set up Rey getting the idea that she could even use the dagger Goonies-style to line it up with the wreckage and pinpoint the location of the wayfinder.