I think I would rather do that, to be honest. The only problem is the Spring Fair commitee from episode 9. Maybe we could say they're planning it months in advance. The 1/2/2018 date from a computer also, but I'm willing to ignore those if it becomes absolutely necessary.Maybe move iron fist back instead?
Does a non-specific late 2017 placement for both of them sound okay?