After trying many different options, I am sticking with org-mode (encrypted with ELPA) + dropbox or syncthing for now. I schedule weekly sessions (usually on Sundays) to sort out all information, check if my TODO items are done or blocked and make sure all my tagging is consistent.
Only exception is when I am on the go and I want to take quick notes on my phone. For this I use google keep, making the notes sticky until I am in front of any of my laptops and dump the note into org mode again.