Hi, I've not used the new wiki and while I like the idea of using markup in theory I can imagine the frustration of using it regularly.
I didn't want to say this earlier as Michael seemed keen to write his own wiki, but have you considered using Atlassian confluence? It's free for open source software https://www.atlassian.com/software/views/open-source-license-request
They may even host a copy on their cloud if you want.
dnl