Scrivener 3 is just around the corner and will be released before the end of 2017, so perhaps you'd be willing to give it a go again, when it comes out. Quite a few writers swear to Scrivener and how it organizes things, as is apparent in this thread.