My preference is asciidoc, but really the issue is that we are using both right now I don't care which one we choose as long as we don't have to use both.