I think he tells the story differently in one of the sequels, but it’s kinda moot. There’s really no contradiction between the two.

Anyway, modern Muslims would regard the Fremen as apostate either for altering the religion or for allowing outsiders to alter it.