.................... Please correct me if you see me making any errors.
I wouldn't go so far as to see errors, my point that remains is that Wahhabism is not the Islam of 632, it did not arise as an interpretation until Muhammad ibn ʿAbd al-Wahhāb formulated it in the 18th century.
It came to prominence only via Wahhab's alliance with the Saud tribe and before that played no role in Islamic governance anywhere. Not in the caliphates and not in the (later) to follow Ottoman Sultanate.
Although sharing common concepts and often feeding off each other, Salafists are not by default Wahhabites and Wahhabites not by default Salafists. Where some of either will claim the distinction to be moot, there are just as many in either camp insisting on that distinction.
By the early 1900s the reformative currents of modernisation in Islam were actually called Salafiyya. Nevertheless the 6 day war (with Israel) and the Iranian revolution caused inner factions today best described as neo-fundmentalist to wash to the top virtually everywhere except in Saudi. Saudi having already been what one may unkindly term stone age Islam ever since its kingdom was founded, respectively the tribe conquered the peninsula.
What by now both (separate or one as part of the other) share is the design to reject centuries of theological development in Islam, ultimately wishing to return to the fundamental roots (no dispute from me there).
To hold them, in their return to the backwardness of fundamentalism, as representing Islam overall would however be incorrect.
That Islam, thruout the centuries, has always been open to interpretation and current attempts by fundamentalists to eradicate that quality are nothing new in its overall history.
So black and white it ain't.
P.S. to apply the term Salafist to all wanting to return to the 7th century is a misleading generalization. Wahhabists are quite a different matter.