Woo! Congratulations on completing your Rey Nobody edit, Hal! (And huge kudos to Spence as well.) “At last, the circle is now complete.”

Regarding the continuity issue, personally, I wouldn’t torture yourself over this stuff. Rise of Skywalker itself is basically a conglomeration of retcons held together by plot contrivances and whiz-bang pacing - Lucasfilm clearly isn’t concerned with making sure every single installment fits together perfectly. And besides, your edit doesn’t deny the baby slaughter; it just…neatly sidesteps it.