I use a tiered folder approach that sounds similar to yours accept I file by topics, location, etc and add dates to file/folder names. I don't trust any of the management systems that want to move your photos into their own proprietary filing and naming system that can't easily be used without their software. To many of those system have went away or changed over the years. If I want to browse because I can't find something or don't know for sure what I'm looking for I use the browser that comes with
GraphicConverter. Besides being easy to dive down on directory trees it has a built in editor for EXIF data if you want to fix or edit that data. You can do rotates and other simple manipulation on the images from the browser. When you need more, the main editor is very good and can read and write most any image format, Fairly reasonably priced at $40. Works with your filing method.
The other thing you need to do is be sure you have all your photos backed up. I do daily backups and keep a second backup in a fireproof safe in a different location that I update a few times a year. The Cloud is another option but if you have a lot of images be prepared to pay and don't make that your only backup those systems seem to go away on a regular bases.