If you haven't tried Obsidian, I would. It has the features you were looking for. The downside being it is directory (vault) based as well and doesn't really offer the ability to edit one off files.