Neither of these rollovers was taxable and would only have affected the amount on Form 2017 1040 line 16a and the rollover notation next to line 16b, so there is really nothing to amend on your 2017 tax return. If the IRS hasn't questioned these rollovers by now, they probably never will. Even if they do, you can just provide IRA account statements to show that these rollovers were properly completed.
As far as the information that is in 2021 TurboTax, all you need to do is update your Roth IRA contribution basis to reflect the amount of contributions rolled over from the Roth 401(k). If your Roth 401(k) was qualified as of 2017 (you were over age 59½ at the time of the distribution from the Roth 401(k) and your first Roth 401(k) contribution was made for 2012 or earlier), the entire amount rolled over to the Roth IRA is treated as contribution basis in the Roth IRA, otherwise only the contributions that you made to the Roth 401(k), but not the earnings, are treated as contribution basis in the Roth IRA.
