@Emy95
It sounds correct, except that the amount of excess you remove in the contributions section (contributions removed before the due date), should be the amount of contributions not including income. The income is covered when you enter the 1099-R as income. This will not change your tax but it could affect future calculates of Roth withdrawals.
You can ignore the "removed before April 15" deadline, that does not apply if you have not filed your original return yet and you have an extension.
