It may be enough to simply remove Leia’s lines about Snoke, even though it’s a cringey name no matter who says it, and that whole Maz’s Castle section has problems that won’t be solved simply with the ‘leaving’ change, so everything’s up in the air at this point.
I think we both know how a duel of the edits would end up - my edit would probably have more crazy ideas, and yours would be more professional. 😉