The rule that ends the reorganising: pick one organising idea and do not run two.
Folders and tags together is where people lose weekends, because every new note poses the question of which system it belongs to, and the answer is arbitrary. Two systems means two decisions per note and no consistency in either.
So:
Folders only, if you think in projects and places.
Tags only, if you think in themes, and keep the vocabulary small - under twenty. A tag used once is not a tag, it is a word, and search already handles words.
Neither, with a flat folder and good titles, which works better than people expect if you also write good titles.
Whichever you choose, the thing that does most of the work is the title. A note called meeting is unfindable by any means. One called client onboarding call, decision on pricing tiers is findable by search, scanning and memory, in any structure or none.
And on your notes you know exist and cannot find: that is nearly always a titling problem rather than a filing one. Try searching for what you would have written rather than what it was about: your own phrasing is usually in there.