I agree wholeheartedly with your assessment. However regarding continuing the massage after HE can be extremely subjective. Some clients like to jump up and get off the table once they get their rocks off and others want to bask in the afterglow and be massaged, caressed, hugged... I believe it's up to the Masseur however, to read the client's body language. Perhaps if unsure, a gentle whisper inquiring if "would you like me to rub you down a little longer", or "Is there anything else I can do for you"?
Finishing off with face, head, feet massage, gentle stretching and if there is some chemistry, showering together, are all great endings