I think their relationship will always be a bit stilted, but not as bad as it is when we first meet Cassi as an adult in Post Pomp. The Doctor does learn a little from that meeting and tries not to make the same mistakes. And some stuff gets worked out in Andromeda Rising, too.