Report the 2016 recharacterization on your 2016 tax return (even though you did it in 2017), and the 2017 recharacterization next year.
TurboTax will automatically generate a form 8606 if based on your 1099-R entry. See more detail below, if needed:
https://ttlc.intuit.com/replies/5764599
