"the adjustments to the cost basis of the matched securities should balance the accounting so your taxable gains are what you expect."
This happens on your next tax return (assuming you closed the trades). You have to wait another year to get the resolution you are so dearly seeking.
Your best approach is to avoid wash sales altogether as much as possible.
