I think there's a much easier solution, just stop the clock and do away with injury time.
Whenever there is a major stoppage, injury, penalty, attacking free kick etc just have the referee stop the clock.
Then book people properly for time wasting, yes it's a soft yellow card but it's ruining...