To solve the problem of Ochi’s name, you could have Rey say his name while she puts her hand on the page with the wayfinder at the start of the film. That way, when she sees Ochi’s ship she instantly rememberes what Luke wrote in the Jedi texts. Or she can mention Ochi of Bestoon when she talks to Poe about following Luke’s trail in the forbidden desert of passana.
I was just watching it back to see if you mention his name to Leia…