Riven did have a couple of annoying "click until you get it" spots (the pitch-black tunnel in the boiler room, for example), but yeah, the puzzles were much more organic.