Sure, first of all you absolutely SHOULD be able to hug her during this cutscene, you should get an option to stay there with her too. Tav leaving there has such a "whatever girl, don't cry too loud please, we are sleeping you know" vibe it's just xd. After this there should be a morning conversation with something like you suggested I think.

Anyways thats how I think of improval for that thing.