It’s been a bit, but I posted about what I think is the same issue here:
I wound up just using the airing order and doing the two-part episodes.
