I think the writers have thoroughly spoiled the denouement of the 'John' storyline. It was, very briefly, enjoyable when the realisation hit of what John had been up to but they massively cocked up the Mack side of the story - him being dumped in a wheelchair followed, seconds later, by Moira crying that he might not make it, to him being home, albeit with a slight limp, a couple of days later (having been shot through the shoulder with an arrow, had a rock dropped on him and been starved in a bunker and drugged for however long).
Dragging it out further with this escape plan, the daftest border security guards (and dog!) and Cain being dumped in the boot of a car etc etc. The momentum will have gone by the time John is caught / killed, no one will care too much by then.
Still, if it keeps D-man and his dreary side-kick off the screens, I can only be thankful for that.