First of all, nobody said that there would be no battery upgrade for the golf. Who knows, maybe they will even build the next golf on the 8th gen after all.
Then, just because they are similar, I don't think that they'd have to discontinue one of the two(id / golf). For instance there's the...