It sounds to me like you need an accountability buddy more than a new system. Having goals that you have to announce to a fellow human being will force you to i

It sounds to me like you need an accountability buddy more than a new system. Having goals that you have to announce to a fellow human being will force you to ignore the distractions and focus on reaching those goals. Even a small goal achieved daily is better than chaos. As for finding things, you could just use your operating systems search features, and accept the trade offs that are involved. Regardless of the tools, there are no perfect hierarchies, tags are a much better way to find things.