1. $2,570 is the correct amount to have shown on line 1 of your 2018 Form 8606, no need to amend if that's what it showed. The higher amount is the amount that was transferred, not the amount recharacterized.
2. Your Form 1099-R shows the amount distributed from your traditional IRA in 2019. Your 2019 Form 8606 should show $6,000 on line 1, and $2,570 on line 2 (with amount on line 2 coming from line 14 of your 2018 Form 8606). Assuming that you had no money in traditional IRAs as the end of 2019, the resulting taxable amount of your Roth conversion is $46.52 (rounding to $47) and is the amount that should be present on line 18 of your 2019 Form 8606.
