It's the absolute worst kind of character arc cul-de-sac. I hope maybe they'll send him to Riverrun anyway and he'll do what he does in the book, but then it'll be yet another example of Thrones making Jaime do something stupid and out of character when Cersei's around. Though, to season 6's credit, not the worst…