I had similar annoyances with Jekyll / Octopress and chose to switch to Pelican. Now I can only blame not writing on myself. :)