whylamb, Research has continued and I think that #WriteFreely, despite being a great piece of software, isn't really accurate for my needs and is a bit too restrictive.
#Hugo might be more what I need, so I'll look at upgrading to that at some point. I just need to work out how to self host it!