TBH the show could do without Bash's storyline, i mean I know a subplot makes a good show, but he hasn't had enough screen time to make it a believable subplot.
Personally, I think they're rushing it because they want to finish Mary's life off this series. Like her whole imprisonment etc. They know the show will drop without Toby so they'll just go straight for Mary's demise now, rather than make up a whole new life for her