Yes. This is the obvious course of action, for everyone except Severus Snape. Hopefully, he'll follow Minerva's advice. He'll be happier if he does. :D

I'm glad you enjoyed this one, sarahsezlove. Thanks, as always, for your kind and lovely comment. :)