Totally. If Gil wants things to work out, as soon as he meets up with Agatha he needs to a)duck, b)apologize, c)establish that he respects her as an autonomous person who could probably kick his ass if she wanted to on both a physical and sparky level, d)let her know that her parents (Adam and Lilith, that is)are alive and recovering nicely (not earlier than this because it's hard to phrase in a way that doesn't sound vaguely menacing).

If they get to this point before March, I will be incredibly surprised. Even in-story, it won't be happening quickly 'cause there'll be death traps and castle repairs and Tarvek being Tarvek and people shooting at them in between. Once they get things settled, the Castle will probably be tired of waiting and lock them in a room together until things are sorted out.