Welcome to the club 
. I did this two years ago and have never looked back (see GitHub - rtrppl/orgrr: A fast, feature-rich and reliable note-taking system for Orgmode/Emacs. Just files, no database.).
Did you see org-mem (GitHub - meedstrom/org-mem: Turn thousands of Org files into a database in seconds)?