After what I suppose has been 15 years of searching, I have settled on the Zettelkasten method using Doom Emacs (Vim-like keybindings) with org-mode and org-roam (https://www.orgroam.com). I struggle to think of anything that could beat it.