I have to agree with the other two replies (use the folder names to organise and get an external hard drive to back up all such data anyway). Whatever viewer you use to look at thumbnails and add tags etc will only ever work for a relatively short time; think ahead twenty years and that software won't be around and probably won't work on whatever computer you have then! The folder-sorting is most likely to remain, however.
Also, there is no chance of getting it "right" first time. Life just isn't like that, alas. The best you can do is decide upon some overall scheme of organising, and keep it simple enough to accommodate all the exceptions which will come along ... as they will! The same principle would apply to designing a cupboard to take all your clothes, with drawers, hangers, racks etc in various sizes: what you have now will change over the years, so make it as flexible as possible.