Thanks for the answer. I got it figured out now with no additional tax ramifications. Am filing an amended 2016 return with amended 8606, as well as the 8606 I failed to file for 2015. That clears it all up and makes my 2017 taxes correct before I file those.
