Thank you very much.
This confirms that I must first do 2016 Form 5329 and amend the 2016 taxes.
Form 5329 for 2017 has questions about 5329 amounts for 2016 which I will then be able to provide in addition to the PJ amounts for 2017 excess. That should help me amend the 2017 taxes.
I've entered all the amounts from the 1099-R in my 2018 filing and the only figure that affected anthing was the Box 4 amount from the PJ entry which got included in the computation for line 16 on the 1040 for 2018.
