When you enter the 1099-R in your amendment return in 2017 there should be a follow-up question "Which year on Form 1099-R?" when you select 2018 TurboTax should include it correctly.
