Frankly, I believe you need professional tax guidance at this point.
The exchange should have been reported in the tax year in which the relinquished property was transferred on Form 8824.
