Because the distribution was made after April 15, 2018, the excess deferral is taxable in both the year of the excess deferral and the year of its distribution. The code P Form 1099-R shows that it is taxable on your 2017 tax return (the year of the excess deferral) and the code 8 Form 1099-R with the entire excess and earnings shown as taxable is taxable on your 2018 tax return. Because the corrective distribution was not made by the deadline, it's indeed subject to double taxation, unfortunately.
If your filed 2017 tax return did not already include the amount of excess deferrals in income, you must amend your 2017 to add this income. You can do this by entering the code P 2018 Form 1099-R into 2017 TurboTax if the form shows the gross amount as taxable.
