You are correct. You should be adding the income that was included in your W-2 to the cost basis for your sale.
