What I don't like is the first tie-breaker is not head-to-head results.
While I don’t disagree with your point, in the case of the tie between Portugal and the US this year, the head-to-head tiebreaker would have been indecisive - the head to head match was a draw. Presumably, goal differential would be your preferrred second tiebreaker?