The calculation of 2d6 + 2d6 + 1d6 + 1d6 is correct. Half-orc and Brutal Critical gives you an additional die, not an additional dice multiplier. Half-orc Barbarian is consequently the only build where greataxes have an advantage over greatswords.
That being said, in BG3 the unique greatswords will still probably be better overall.