Hi!
Another approach is to reduce the complexity of wikitext editing by
using syntax highlighting and javascript dialogs. There is wikEd editor
which is being developed with such approach in mind:
http://en.wikipedia.org/wiki/User:Cacycle/wikEd
I does diffs, too.
Dmitriy