Setting up a storage strategy (including how you set up your folders) doesn't have to be complicated. I store everything chronologically, but have separate folders for special events, trips, etc, where again I use a chronological approach, but cluster these files together.
I also have a backup strategy where I store duplicate files in at least 2 and in some cases three places that are not right beside each other. I do use RAID (and RAID like) drives for backup, so when disks fail, I can quickly restore my files.
When it comes to using Lightroom; I stronly suggest you do not depend on the catalog system for storing your edits; you are now well aquainted with the weaknesses (in my view "fatal design flaw"), with that tool. Save your edits as either dng files or (my preferred approach) as sidecar .xmp files (done in the catalog settings).