Would auto-trapping abilities like Shadow Tag and Arena Trap be fixed by having them last only 3 or 5 five turns?
This still gives the trapper time to possibly win the 1v1, but removes the possibility of indefinite stall.
This obviously wouldn't affect trapping moves which are a non-issue.