I think in terms of "teaching Harry" or "managing Harry", we've got everything we need. With Dumbledore gone, the odds of Harry being under Snape's management again seem pretty unlikely.