WIP break ties in OvO using scores

Fixes #1398.
I was not able to produce a regression test yet :( any help would be appreciated.