I'm using TradeLog this year precisely because of wash sales and accurate reporting. For me the problem is I have 5 brokers I trade with ... so it's always poss...
Option 1 sounds right but you would send the complete list of trades in Form 8949 (since as indicated you didn't include those details electronically). I'm not ...
