I'm not sure I believe Cece as A/Charles was really planned since season 3, either. It does seem like it was decided sometime in the last two seasons and then they backtracked to make it work.

Sarah as Red Coat/Black Widow was the most disappointing reveal on this show ever. Basically anyone else would have been better, including Bethany.