Unify best move update logic