How about eliminating both the PC and TC fouls. Instead use the punch to indicate an "offensive foul" when a common foul is committed:
- by a player who is holding or dribbling a live ball inbounds;
- by a teammate of a player who is holding or dribbling a live ball inbounds;
- by an airborne player who has tapped or released the ball for a try for goal;
- by a member of the throw-in team between the time the ball is at the disposal of the inbounder and the time the throw-in pass is controlled (held or dribbled) inbounds.
This essentially makes the rule the same as the NBA and NCAA rules, but doesn't make any changes to the definition of team control.