I'm also working on solving this problem, but my solution is to teach vanilla HTML, CSS and JavaScript by making an IDE with WYSIWYG, real time analysis and other goodies.
Trying to get people who make Word documents to make web documents instead, using HTML. I think it's time to bring HTML and the web to the mainstream. Companies are currently paying hundreds thousands of dollars to copy/paste from Word to a CMS that store the document in a database blob, when they could make HTML documents themselves for peanuts. Once you have the documents in HTML format instead of a closed binary format, it's possible to use all the nice tools we developers use, like git.