As I promised in the comments, I wanted to let you know the outcome to my tax mess. My CPA originally sent me a bill for the extra work, but when I detailed the issue and the facts, she ultimately didn't charge me anything for the extra work.
I'm now a satisfied customer again. ;-)
Comments