I like the way Athom chose to have just one trigger for a flow. It prevent the flows to become complex.
It just requires a little bit of different thinking:
Not: I want to trigger a flow when this or that happens
But: When this happens I want to trigger a flow, when that happens I want to trigger the flow.
I wrote a post about how I use to structure my flows, maybe it helps (since you are cleaning up your flows anyway…)