After searching around (and trying Roam, Obsidian, a bit of Tiddlywiki, etc) I ended up sticking with Athens [0][1]. It's essentially an open-source version of Roam, and it's YC funded. I've found it to already be mature enough to be a good replacement for Roam.