tedster - 5:25 am on Oct 14, 2011 (gmt 0)
My preference would be to back things up to their original condition.
However, I don't understand how this created 30,000 duplicate titles. If there's a true 301 redirect, then googlebot shouldn't even get any text for the original URL. It sounds like there might be something else going on in addition to the problem you described.