I actually like Phil's suggestion better than my own

And I just recommended yours. Shame on me for not bringing up the issue of custodian responsibility for this mess. The taxpayer definitely shouldn't be out any money because of the custodian's errors.

What a mutual admiration society we have going here!! Seriously, the OP can take the best of both approaches - push back hard on the advisor/custodian and take proactive steps with regard to the IRS rather than waiting for the IRS to discover things a year from now.

Ira