what you propose should do. I'm not sure that the w-2 is needed because the issue seems to be solely that the sale of the stock was not reported on your return but was reported to the IRS with no cost. therefore the 1099-B showing cost and the 8949 should be adequate with an explanation. it won't hurt to send the w-2.
