Get your taxes done using TurboTax

no, you adjust now for your records and mark those shares matched. when you sell the replacement shares, the arithmetic is already done.