You might want to try this new logseq though, if the devs have not burned all your goodwill. You can use it with a markdown mirror (it's a feature under settings) so you keep you same notes in markdown as well.
It's open-source, really well designed, local, you can even self-host sync...
But: the devs make questionable decisions that makes the development roadmap quite bumpy. It should ease up.