Season 6: Showdown with the EQ?

In rewatching the show, I've begun to question whether the writers had initially intended from seasons 5B -6A to have Regina's EQ half be the big bad for the finale given that we don't see Regina in Emma's vision. Is it possible that the destruction of the EC initially meant granting Regina a clean slate once the EQ was defeated?