Great cap on Freemason history.
There are many theories, the one you touched on is the more "official" version of our history, what one is "fact" no one knows for sure.
I personally follow the Templar version of history, or at least a variant of that version.