Check out https://obsidian.md/ if you haven't already.
Even better, it stores everything in plain Markdown files in a folder hierarchy, so you can easily back everything up and/or interact with them outside the app if need be.
Even EVEN better, they have mobile apps that are perfectly happy to let you use your own file-syncing mechanism if you want to (although they do offer a sync service of their own as well.) Once I got it set up, everything Just Worked.