Took a brief look at Orgmode and it looks great. It also appears to be more feature packed than Vimwiki. Let me give it a shot. I'm a Vim user, so I hope I don't get too disoriented by Emacs.