Regarding 1 though 4, that's correct. Regarding your 2017 tax return, you said that you've already reported the excess contribution and paid the penalty with your 2017 tax return, so there is nothing to amend.
