I'm in a very similar situation and the company that issued my 1099-R won't correct it :( How'd it turn out for you? Did you end up submitting your own corrected version of the 1099-R to reduce the taxable amount? Thanks!
