Personally I've moved on to a privately hosted Git repo of plain Markdown files which I currently modify with Obsidian (although I'd prefer an open-source version, and Logseq doesn't quite scratch the itch like Obsidian does) - because I realised what I needed is like a self-hosted Notion-like alternative which I can trust, and Obsidian with all its plugins does exactly what I need.
The only major downside is that taking notes on another device and syncing them without merge conflicts is still a pain.