I disagree, GOT was never meant to be predictable. That episode delivered the goods 9/10 !
PS: Jaime did Brienne a favor, he was never in love with her; not more so than Cercie. He knew Cercie would die— so left Brienne and that unlikely 'happy ending' along with her.