I doubt it. It wouldn't surprise me if McGonagall stayed on as Head of Gryffindor while simultaneously being Headmistress.
Of course, I doubt much (if any) of the next book will deal with the characters while at Hogwarts, so the issue may be left unresolved....