It's an interesting distinction between the words, which you have explained very very well.
The use of the word horror, pertaining to the motion picture genre (which examples given are usually just made to be terrifying, according to your definitions), has colored that word for many of us with the popular culture frame of reference.
I'd certainly have to agree with you, terror is better than horror, in terms of actual experience.