Both your points seem on track, but there's still something missing... Reverse/Rebirth and Days show that Riku is unaffected in anyway to Sora's memory loss... Perhaps it is the darkness. It would be interesting to see Xemnas' plan come to fruition and Riku being the only one knowing Xion isn't really Sora.