I would suggest creating a new DataSet with a custom SQL query
Then replace the failing DataSet with the new one with the replace option offered in the Analysis. That way the reports should still work as before.
I would recommend working with views and custom queries from now on.