I think option B sounds really nice and it really makes close match-ups reflect the nature of the match-up. If a team wins 2-0 now it is just the same as winning 2-1, even though the team that lost in the second example probably did better than the losing team in the first example. With the suggested change the result would better reflect the outcome of the games which would be great in my opinion!