Retirement tax questions

You are too many transactions down the road to be able to do that.  Even if the contribution was made for 2016, the code 1 distribution has locked you in to it being a traditional IRA contribution.