It is normal for the Federal and State refund amount o go to zero when you choose that you're amending. The 2017 amend form 1040X is not available yet so you could not have been going all the way though the amend process.
Yes, you should amend, but you wait until after you have received any refund from your original return, and then say you received that refund when you do the amendment. Amended returns have to be mailed on paper and it takes the IRS 12-16 weeks to process them. for now, you should remove any changes you made to your return and then enter them again when you amend. Given that you would use Fair Market Value in December as your cost basis and the sale prices in January, with an uptick in the market you should show some gains.
How to amend:
https://ttlc.intuit.com/questions/1894381-how-to-amend-change-or-correct-a-return-you-already-filed#
