Yes, the amount in box 2a is subject to tax an early-distribution penalty on your 2017 tax return, so your amendment will also include 2017 Form 5329. The amount in box 4 will be included on line 16 of your *2018* Form 1040, not as tax withholding on your 2017 amendment.
