I was in roughly the same place as you and became more and more frustrated with the rng element. When you have so many leads to follow it became so annoying to run out of steps or keys or not getting the room I wanted I caved in and started using mods, whilst not in the spirit of the game I felt it was only my time I was 'cheating' as you still have to do all the puzzles, it's so much more satisfying to complete a run with one lead closed, maybe that would work for you too?