I actually used the simplified method worksheet to validate the entries into TurboTax from 2016 to 2019 and the calculations worked out well. So these are the entries I made and filed. I amended 2017 - 2019 taxes as the 2016 1099-r was correct. The annuity started 2017/01/02.
