I found it much easier to break things down into obvious vs. non-obvious hazards, both being different travel activities. You use perception to find hidden things that are obviously hazards, such as tripwires and hidden creatures. You use investigation to realize that some obvious thing is important, such as more dust on a section of floor (trigger plate) or off colored stones on the wall (secret door). Occasionally I'll require both to be successful, and other times its a Nature or Survival check instead. It takes a lot away from the over reliance on wisdom & perception and boosts intelligence & investigation.If a roll is needed at all, I call for Investigation or Perception for traps, then Investigation (again, if needed) to figure out how the trap works before it can be disabled. For secret doors, it's Perception to find it, then Investigation to figure out how to open it, if a roll is necessary. Each task takes about 10 minutes, so a given trap interaction can take about 30 minutes of in-game time, and secret doors about 20 minutes.
So we might see the rogue or the cleric or even the wizard out front searching for traps (though the wizard tends not to be so brave!).