My answer here addresses your need; basically make your rules more specific by having more than one trigger (use the + sign) to target just what you want and thus avoiding Waiting/Blocked.
You may need a few extra rules as a result.
Multiple triggers can either 1) all be required, or 2) any one be required. You would want 1) all be required.